Merge branch 'master' into committers/fnoyrit/gmft

Conflicts:
	extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
	extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF
	extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
	extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/security/CollabReadOnlyHandler.java
	extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/dialogs/PreviewDialog.java
	extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNCommitter.java
	plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF
	plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/META-INF/MANIFEST.MF
	plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
	plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
	plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/NotationHelper.java
	plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
	plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
	plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
	plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
	plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
	plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/META-INF/MANIFEST.MF
	plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/META-INF/MANIFEST.MF
	plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF
	plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
	plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/META-INF/MANIFEST.MF
	plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/META-INF/MANIFEST.MF
	plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
	plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF
	plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
	plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
	plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF
	plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CustomContextLinkCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/MultiAssociationHelper.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/itemsemantic/CustomAssociationItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationNodeCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassCreateCommandCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassifierTemplateParameterCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentCreateCommandCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ComponentCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ComponentCreateCommandCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectableElementTemplateParameterCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintCreateCommandCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ContextLinkCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DataTypeCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DataTypeCreateCommandCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DefaultNamedElementCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyNodeCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DurationObservationCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationCreateCommandCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationLiteralCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InformationItemCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InformationItemCreateCommandCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationCreateCommandCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceCreateCommandCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ModelCreateCommandCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ModelCreateCommandTN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForClassCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForComponentCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForInterfaceCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedDataTypeForClassCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedDataTypeForComponentCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedDataTypeForInterfaceCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedEnumerationForClassCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedEnumerationForComponentCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedEnumerationForInterfaceCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedInterfaceForClassCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedInterfaceForComponentCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedInterfaceForInterfaceCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedPrimitiveTypeForClassCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedPrimitiveTypeForComponentCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedPrimitiveTypeForInterfaceCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedSignalForClassCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedSignalForComponentCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedSignalForInterfaceCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForClassCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForComponentCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForDataTypeCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForInterfaceCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForPrimitiveTypeCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationTemplateParameterCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageCreateCommandCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PrimitiveTypeCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PrimitiveTypeCreateCommandCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForClassCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForComponentCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForInterfaceCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForSignalCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyforDataTypeCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyforPrimitiveTypeCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ReceptionCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ReceptionInInterfaceCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RedefinableTemplateSignatureCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ShapeNamedElementCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ShortCutDiagramCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SignalCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SignalCreateCommandCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SlotCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateParameterCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateSignatureCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TimeObservationCreateCommand.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassOperationCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyTN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalItemSemanticEditPolicyCN.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
	plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
	plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
	plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF

658 files changed, 174 insertions, 193212 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
index b6855aeb0cc..44b29b1bae1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
@@ -89,6 +89,8 @@ Require-Bundle: org.eclipse.core.expressions,
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.activity.part.UMLDia

+ gramEditorPlugin

 Bundle-ManifestVersion: 2

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

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

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

+

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
index 29909f9a05b..862548ec426 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
@@ -30,7 +30,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Require-Bundle: org.eclipse.core.expressions,

  org.eclipse.ui.navigator,

  org.eclipse.ui.navigator.resources,

@@ -92,6 +92,8 @@ Require-Bundle: org.eclipse.core.expressions,
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagra

+ mEditorPlugin

 Bundle-ManifestVersion: 2

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

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

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

+

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CustomContextLinkCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CustomContextLinkCreateCommand.java
index a0b2901fe52..874db1307ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CustomContextLinkCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CustomContextLinkCreateCommand.java
@@ -41,61 +41,61 @@ public class CustomContextLinkCreateCommand extends ContextLinkCreateCommand {
 

 	@Override

 	public boolean canExecute() {

-		if (source == null && target == null) {

+		if(source == null && target == null) {

 			return false;

 		}

-		if (source != null && false == source instanceof Constraint) {

+		if(source != null && false == source instanceof Constraint) {

 			return false;

 		}

-		if (target != null && false == target instanceof Namespace) {

+		if(target != null && false == target instanceof Namespace) {

 			return false;

 		}

-		if (getSource() == null) {

+		if(getSource() == null) {

 			return true; // link creation is in progress; source is not defined yet

 		}

-		if (getSource() != null) {

+		if(getSource() != null) {

 			// the context is already set

-			if (getSource().getContext() != null && target != null && getSource().getContext() != target) {

+			if(getSource().getContext() != null && target != null && getSource().getContext() != target) {

 				return false;

 			}

 		}

 		View viewSource = findView(source);

-

-		if (viewSource != null && source instanceof Constraint) {

+		

+		if(viewSource != null && source instanceof Constraint) {

 			View viewTarget = findView(target);

 			List sourceConnections = ViewUtil.getSourceConnections(viewSource);

-

-			for (Object connector : sourceConnections) {

-				if (!(connector instanceof Connector)) {

+			

+			for(Object connector : sourceConnections) {

+				if(!(connector instanceof Connector)) {

 					continue;

 				}

-				Edge edge = (Edge) connector;

+				Edge edge = (Edge)connector;

 

-				if (("" + ContextLinkEditPart.VISUAL_ID).equals(edge.getType())) {

-					if (viewTarget == edge.getTarget()) {

+				if(("" + ContextLinkEditPart.VISUAL_ID).equals(edge.getType())) {

+					if(viewTarget == edge.getTarget()) {

 						// the context link is already

-						// drawn between the Constraint and the NamedElement

+						//  drawn between the Constraint and the NamedElement

 						return false;

 					}

 				}

 			}

 		}

 		if (getTarget() != null && (getTarget().getOwnedRules().contains(getTarget()))) {

-

+				

 			return false;

 		}

 		return true;

 	}

 

 	private View findView(EObject element) {

-		if (element == null) {

+		if(element == null) {

 			return null;

 		}

 		Collection<Setting> settings = CacheAdapter.getInstance().getNonNavigableInverseReferences(element);

-		for (Setting ref : settings) {

-			if (NotationPackage.eINSTANCE.getView_Element().equals(ref.getEStructuralFeature())) {

-				View view = (View) ref.getEObject();

-				if (view != null) {

+		for(Setting ref : settings) {

+			if(NotationPackage.eINSTANCE.getView_Element().equals(ref.getEStructuralFeature())) {

+				View view = (View)ref.getEObject();

+				if(view != null) {

 					return view;

 				}

 			}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/itemsemantic/CustomAssociationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/itemsemantic/CustomAssociationItemSemanticEditPolicy.java
index 58d6242d913..56e770bc998 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/itemsemantic/CustomAssociationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/itemsemantic/CustomAssociationItemSemanticEditPolicy.java
@@ -50,20 +50,20 @@ public class CustomAssociationItemSemanticEditPolicy extends AssociationItemSema
 	 * {@inheritDoc}

 	 */

 	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		if (UMLElementTypes.Association_4001 == req.getElementType()) {

+		if(UMLElementTypes.Association_4001 == req.getElementType()) {

 			return getGEFWrapper(new CAssociationCreateCommand(req, req.getSource(), req.getTarget(), DiagramUtils.getDiagramFrom(getHost())));

 		}

-		if (UMLElementTypes.AssociationClass_4017 == req.getElementType()) {

+		if(UMLElementTypes.AssociationClass_4017 == req.getElementType()) {

 			return getGEFWrapper(new CAssociationClassCreateCommand(req, req.getSource(), req.getTarget(), DiagramUtils.getDiagramFrom(getHost())));

 		}

-		if (UMLElementTypes.TemplateBinding_4015 == req.getElementType()) {

+		if(UMLElementTypes.TemplateBinding_4015 == req.getElementType()) {

 			return UnexecutableCommand.INSTANCE;

 		}

 		return super.getCompleteCreateRelationshipCommand(req);

 	}

 

 	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

+		switch(getVisualID(req)) {

 		case AssociationClassLinkEditPart.VISUAL_ID:

 			return getGEFWrapper(new CAssociationReorientCommand(req));

 		case AssociationEditPart.VISUAL_ID:

@@ -79,21 +79,22 @@ public class CustomAssociationItemSemanticEditPolicy extends AssociationItemSema
 	 */

 	@Override

 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

 		CompoundCommand cmd = new CompoundCommand();

 		List<EObject> todestroy = new ArrayList<EObject>();

 		EObject mainObjectToDelete = req.getElementToDestroy();

 		todestroy.add(mainObjectToDelete);

-		if (mainObjectToDelete instanceof Association) {

+		if(mainObjectToDelete instanceof Association) {

 			// check end properties. If they do not belong to the association, they should be deleted also

-			Association association = (Association) mainObjectToDelete;

-			for (Property end : association.getMemberEnds()) {

-				if (end.getOwner() != association) {

+			Association association = (Association)mainObjectToDelete;

+			for(Property end : association.getMemberEnds()) {

+				if(end.getOwner() != association) {

 					IElementEditService provider = ElementEditServiceUtils.getCommandProvider(end);

 					DestroyElementRequest Destructreq = new DestroyElementRequest(end, false);

-					if (provider != null) {

+					if(provider != null) {

 						// Retrieve delete command from the Element Edit service

 						ICommand deleteCommand = provider.getEditCommand(Destructreq);

-						if (deleteCommand != null) {

+						if(deleteCommand != null) {

 							cmd.add(new ICommandProxy(deleteCommand));

 						}

 					}

@@ -109,13 +110,13 @@ public class CustomAssociationItemSemanticEditPolicy extends AssociationItemSema
 	 * {@inheritDoc}

 	 */

 	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		if (UMLElementTypes.Association_4001 == req.getElementType()) {

+		if(UMLElementTypes.Association_4001 == req.getElementType()) {

 			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.clazz.custom.command.CAssociationCreateCommand(req, req.getSource(), req.getTarget(), DiagramUtils.getDiagramFrom(getHost())));

 		}

-		if (UMLElementTypes.AssociationClass_4017 == req.getElementType()) {

+		if(UMLElementTypes.AssociationClass_4017 == req.getElementType()) {

 			return getGEFWrapper(new CAssociationClassCreateCommand(req, req.getSource(), req.getTarget(), DiagramUtils.getDiagramFrom(getHost())));

 		}

-		if (UMLElementTypes.TemplateBinding_4015 == req.getElementType()) {

+		if(UMLElementTypes.TemplateBinding_4015 == req.getElementType()) {

 			return UnexecutableCommand.INSTANCE;

 		}

 		return super.getStartCreateRelationshipCommand(req);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AbstractionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AbstractionCreateCommand.java
deleted file mode 100644
index f52ae16bd89..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AbstractionCreateCommand.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.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_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$

-		}

-

-		Abstraction newElement = UMLFactory.eINSTANCE.createAbstraction();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Abstraction_4006(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AbstractionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AbstractionReorientCommand.java
deleted file mode 100644
index 74a31471bc2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AbstractionReorientCommand.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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_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().canExistAbstraction_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 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationBranchCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationBranchCreateCommand.java
deleted file mode 100644
index 323c8041f0d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationBranchCreateCommand.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Type;

-

-/**

- * @generated

- */

-public class AssociationBranchCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public AssociationBranchCreateCommand(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 Type) {

-			return false;

-		}

-		if (target != null && false == target instanceof Type) {

-			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().canCreateAssociation_4019(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$

-		}

-

-		throw new UnsupportedOperationException();

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Association 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 Type getSource() {

-		return (Type) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Type getTarget() {

-		return (Type) 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationBranchReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationBranchReorientCommand.java
deleted file mode 100644
index 89f01875242..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationBranchReorientCommand.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Type;

-

-/**

- * @generated

- */

-public class AssociationBranchReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public AssociationBranchReorientCommand(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 Association) {

-			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 Type && newEnd instanceof Type)) {

-			return false;

-		}

-		if (getLink().getEndTypes()

-				.size() != 1) {

-			return false;

-		}

-		Type target = (Type) getLink().getEndTypes()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistAssociation_4019(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Type && newEnd instanceof Type)) {

-			return false;

-		}

-		if (getLink().getEndTypes()

-				.size() != 1) {

-			return false;

-		}

-		Type source = (Type) getLink().getEndTypes()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistAssociation_4019(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 {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Association getLink() {

-		return (Association) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Type getOldSource() {

-		return (Type) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Type getNewSource() {

-		return (Type) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Type getOldTarget() {

-		return (Type) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Type getNewTarget() {

-		return (Type) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassCreateCommand.java
deleted file mode 100644
index 10e34a81ed5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.AssociationClass;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class AssociationClassCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassCreateCommand(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.getAssociationClass());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		AssociationClass newElement = UMLFactory.eINSTANCE.createAssociationClass();

-

-		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_AssociationClass_2013(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(AssociationClass 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassLinkCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassLinkCreateCommand.java
deleted file mode 100644
index e56c9f9b1c1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassLinkCreateCommand.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.AssociationClass;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Type;

-

-/**

- * @generated

- */

-public class AssociationClassLinkCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassLinkCreateCommand(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 Type) {

-			return false;

-		}

-		if (target != null && false == target instanceof Type) {

-			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().canCreateAssociationClass_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$

-		}

-

-		throw new UnsupportedOperationException();

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(AssociationClass 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 Type getSource() {

-		return (Type) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Type getTarget() {

-		return (Type) 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassLinkReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassLinkReorientCommand.java
deleted file mode 100644
index 5b4e035c58a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassLinkReorientCommand.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.AssociationClass;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Type;

-

-/**

- * @generated

- */

-public class AssociationClassLinkReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassLinkReorientCommand(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 AssociationClass) {

-			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 Type && newEnd instanceof Type)) {

-			return false;

-		}

-		if (getLink().getEndTypes()

-				.size() != 1) {

-			return false;

-		}

-		Type target = (Type) getLink().getEndTypes()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistAssociationClass_4017(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Type && newEnd instanceof Type)) {

-			return false;

-		}

-		if (getLink().getEndTypes()

-				.size() != 1) {

-			return false;

-		}

-		Type source = (Type) getLink().getEndTypes()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistAssociationClass_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 {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected AssociationClass getLink() {

-		return (AssociationClass) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Type getOldSource() {

-		return (Type) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Type getNewSource() {

-		return (Type) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Type getOldTarget() {

-		return (Type) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Type getNewTarget() {

-		return (Type) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationCreateCommand.java
deleted file mode 100644
index eafe1b1b2e1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationCreateCommand.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Type;

-

-/**

- * @generated

- */

-public class AssociationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public AssociationCreateCommand(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 Type) {

-			return false;

-		}

-		if (target != null && false == target instanceof Type) {

-			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().canCreateAssociation_4001(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$

-		}

-

-		throw new UnsupportedOperationException();

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Association 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 Type getSource() {

-		return (Type) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Type getTarget() {

-		return (Type) 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationNodeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationNodeCreateCommand.java
deleted file mode 100644
index 88947973c62..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationNodeCreateCommand.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.Association;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class AssociationNodeCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public AssociationNodeCreateCommand(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.getAssociation());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		Association newElement = UMLFactory.eINSTANCE.createAssociation();

-

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

-		}

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Association 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationReorientCommand.java
deleted file mode 100644
index bf09b69b9bf..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationReorientCommand.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Type;

-

-/**

- * @generated

- */

-public class AssociationReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public AssociationReorientCommand(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 Association) {

-			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 Type && newEnd instanceof Type)) {

-			return false;

-		}

-		if (getLink().getEndTypes()

-				.size() != 1) {

-			return false;

-		}

-		Type target = (Type) getLink().getEndTypes()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistAssociation_4001(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Type && newEnd instanceof Type)) {

-			return false;

-		}

-		if (getLink().getEndTypes()

-				.size() != 1) {

-			return false;

-		}

-		Type source = (Type) getLink().getEndTypes()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistAssociation_4001(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 {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Association getLink() {

-		return (Association) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Type getOldSource() {

-		return (Type) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Type getNewSource() {

-		return (Type) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Type getOldTarget() {

-		return (Type) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Type getNewTarget() {

-		return (Type) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassCreateCommand.java
deleted file mode 100644
index 1ec49074673..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 ClassCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ClassCreateCommand(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_2008(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassCreateCommandCN.java
deleted file mode 100644
index 6df83b110f1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassCreateCommandCN.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 ClassCreateCommandCN extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ClassCreateCommandCN(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_3010(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassifierTemplateParameterCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassifierTemplateParameterCreateCommand.java
deleted file mode 100644
index 34c3e4a0ee9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassifierTemplateParameterCreateCommand.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.ClassifierTemplateParameter;

-import org.eclipse.uml2.uml.TemplateSignature;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ClassifierTemplateParameterCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ClassifierTemplateParameterCreateCommand(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.getClassifierTemplateParameter());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		ClassifierTemplateParameter newElement = UMLFactory.eINSTANCE.createClassifierTemplateParameter();

-

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

-

-				TemplateSignature qualifiedTarget = (TemplateSignature) target;

-				qualifiedTarget.getOwnedParameters()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		TemplateSignature childHolder = (TemplateSignature) getElementToEdit();

-		childHolder.getParameters()

-				.add(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(ClassifierTemplateParameter 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentAnnotatedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentAnnotatedElementCreateCommand.java
deleted file mode 100644
index 61becd685f2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentAnnotatedElementCreateCommand.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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_4013(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentAnnotatedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentAnnotatedElementReorientCommand.java
deleted file mode 100644
index 2758f6c2f18..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentAnnotatedElementReorientCommand.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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_4013(getNewSource(), getOldTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Element && newEnd instanceof Element)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistCommentAnnotatedElement_4013(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentCreateCommand.java
deleted file mode 100644
index 977f66951e1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 {

-

-	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_2012(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentCreateCommandCN.java
deleted file mode 100644
index 61cb0b0b1ce..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentCreateCommandCN.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 {

-

-	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_3028(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ComponentCreateCommand.java
deleted file mode 100644
index 5445da6d41b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ComponentCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 ComponentCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ComponentCreateCommand(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_2002(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ComponentCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ComponentCreateCommandCN.java
deleted file mode 100644
index 13a613c7a95..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ComponentCreateCommandCN.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 ComponentCreateCommandCN extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ComponentCreateCommandCN(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_3021(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectableElementTemplateParameterCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectableElementTemplateParameterCreateCommand.java
deleted file mode 100644
index 47d677ea994..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectableElementTemplateParameterCreateCommand.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.ConnectableElementTemplateParameter;

-import org.eclipse.uml2.uml.TemplateSignature;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ConnectableElementTemplateParameterCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ConnectableElementTemplateParameterCreateCommand(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.getConnectableElementTemplateParameter());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		ConnectableElementTemplateParameter newElement = UMLFactory.eINSTANCE.createConnectableElementTemplateParameter();

-

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

-

-				TemplateSignature qualifiedTarget = (TemplateSignature) target;

-				qualifiedTarget.getOwnedParameters()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		TemplateSignature childHolder = (TemplateSignature) getElementToEdit();

-		childHolder.getParameters()

-				.add(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(ConnectableElementTemplateParameter 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorDurationObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorDurationObservationCreateCommand.java
deleted file mode 100644
index 534ab06ab7a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorDurationObservationCreateCommand.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.DurationObservation;

-import org.eclipse.uml2.uml.NamedElement;

-

-/**

- * @generated

- */

-public class ConnectorDurationObservationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	public ConnectorDurationObservationCreateCommand(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_4025(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorDurationObservationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorDurationObservationReorientCommand.java
deleted file mode 100644
index 391bef23d28..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorDurationObservationReorientCommand.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.DurationObservation;

-import org.eclipse.uml2.uml.NamedElement;

-

-/**

- * @generated

- */

-public class ConnectorDurationObservationReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject referenceOwner;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public ConnectorDurationObservationReorientCommand(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_4025(getNewSource(), getOldTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDurationObservationEvent_4025(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorTimeObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorTimeObservationCreateCommand.java
deleted file mode 100644
index 51fdb77d9a0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorTimeObservationCreateCommand.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.TimeObservation;

-

-/**

- * @generated

- */

-public class ConnectorTimeObservationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	public ConnectorTimeObservationCreateCommand(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_4024(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorTimeObservationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorTimeObservationReorientCommand.java
deleted file mode 100644
index e0f6b37e486..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorTimeObservationReorientCommand.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.TimeObservation;

-

-/**

- * @generated

- */

-public class ConnectorTimeObservationReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject referenceOwner;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public ConnectorTimeObservationReorientCommand(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_4024(getNewSource(), getOldTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistTimeObservationEvent_4024(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintConstrainedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintConstrainedElementCreateCommand.java
deleted file mode 100644
index e84c4e31491..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintConstrainedElementCreateCommand.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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_4014(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintConstrainedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintConstrainedElementReorientCommand.java
deleted file mode 100644
index 8e6657c43e5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintConstrainedElementReorientCommand.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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_4014(getNewSource(), getOldTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Element && newEnd instanceof Element)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConstraintConstrainedElement_4014(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintCreateCommand.java
deleted file mode 100644
index ccabfec026b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ConstraintCreateCommand extends EditElementCommand {

-

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

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_Constraint_2011(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintCreateCommandCN.java
deleted file mode 100644
index 782ccded052..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintCreateCommandCN.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ConstraintCreateCommandCN extends EditElementCommand {

-

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

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_Constraint_3029(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ContextLinkCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ContextLinkCreateCommand.java
deleted file mode 100644
index 4fcb40964e5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ContextLinkCreateCommand.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Namespace;

-

-/**

- * @generated

- */

-public class ContextLinkCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	public ContextLinkCreateCommand(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 Namespace) {

-			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().canCreateConstraintContext_8500(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().setContext(

-					getTarget()

-					);

-		}

-		return CommandResult.newOKCommandResult();

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Constraint getSource() {

-		return (Constraint) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Namespace getTarget() {

-		return (Namespace) target;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ContextLinkReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ContextLinkReorientCommand.java
deleted file mode 100644
index 4a9c67cb44b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ContextLinkReorientCommand.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Namespace;

-

-/**

- * @generated

- */

-public class ContextLinkReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject referenceOwner;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public ContextLinkReorientCommand(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 Namespace && newEnd instanceof Constraint)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConstraintContext_8500(getNewSource(), getOldTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Namespace && newEnd instanceof Namespace)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConstraintContext_8500(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().setContext(

-				null

-				);

-		getNewSource().setContext(

-				getOldTarget()

-				);

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getOldSource().setContext(

-				getNewTarget()

-				);

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Constraint getOldSource() {

-		return (Constraint) referenceOwner;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Constraint getNewSource() {

-		return (Constraint) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Namespace getOldTarget() {

-		return (Namespace) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Namespace getNewTarget() {

-		return (Namespace) newEnd;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DataTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DataTypeCreateCommand.java
deleted file mode 100644
index 1ff9e8bcbbb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DataTypeCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 {

-

-	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_2010(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DataTypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DataTypeCreateCommandCN.java
deleted file mode 100644
index 7736fb99742..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DataTypeCreateCommandCN.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 DataTypeCreateCommandCN extends EditElementCommand {

-

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

-

-				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_3027(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DefaultNamedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DefaultNamedElementCreateCommand.java
deleted file mode 100644
index 5dd0ccd22d3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DefaultNamedElementCreateCommand.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NamedElement;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DefaultNamedElementCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DefaultNamedElementCreateCommand(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.getNamedElement());

-		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(NamedElement 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/Dependency2ReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/Dependency2ReorientCommand.java
deleted file mode 100644
index 654ef44f35d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/Dependency2ReorientCommand.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class Dependency2ReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public Dependency2ReorientCommand(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_4018(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_4018(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/Dependency3CreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/Dependency3CreateCommand.java
deleted file mode 100644
index 17fe46257ae..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/Dependency3CreateCommand.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.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 Dependency3CreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public Dependency3CreateCommand(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_4018(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_4018(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyCreateCommand.java
deleted file mode 100644
index e7a425dcf9d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyCreateCommand.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.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_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$

-		}

-

-		Dependency newElement = UMLFactory.eINSTANCE.createDependency();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Dependency_4008(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyNodeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyNodeCreateCommand.java
deleted file mode 100644
index 8f00403cc67..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyNodeCreateCommand.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.Dependency;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DependencyNodeCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DependencyNodeCreateCommand(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.getDependency());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		Dependency newElement = UMLFactory.eINSTANCE.createDependency();

-

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

-		}

-

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

-		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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyReorientCommand.java
deleted file mode 100644
index 6965b70e7f9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyReorientCommand.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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_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().canExistDependency_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 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DurationObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DurationObservationCreateCommand.java
deleted file mode 100644
index 2017ef33c43..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DurationObservationCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 {

-

-	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_2095(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ElementImportCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ElementImportCreateCommand.java
deleted file mode 100644
index 899db3726fb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ElementImportCreateCommand.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.ElementImport;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.PackageableElement;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class ElementImportCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	public ElementImportCreateCommand(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 Namespace) {

-			return false;

-		}

-		if (target != null && false == target instanceof PackageableElement) {

-			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().canCreateElementImport_4009(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$

-		}

-

-		ElementImport newElement = UMLFactory.eINSTANCE.createElementImport();

-		getSource().getElementImports()

-				.add(newElement);

-		newElement.setImportedElement(

-				getTarget()

-				);

-		ElementInitializers.getInstance().init_ElementImport_4009(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(ElementImport 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 Namespace getSource() {

-		return (Namespace) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected PackageableElement getTarget() {

-		return (PackageableElement) target;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ElementImportReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ElementImportReorientCommand.java
deleted file mode 100644
index cbd080658d4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ElementImportReorientCommand.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.ElementImport;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.PackageableElement;

-

-/**

- * @generated

- */

-public class ElementImportReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public ElementImportReorientCommand(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 ElementImport) {

-			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 Namespace && newEnd instanceof Namespace)) {

-			return false;

-		}

-		PackageableElement target = getLink().getImportedElement();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistElementImport_4009(getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof PackageableElement && newEnd instanceof PackageableElement)) {

-			return false;

-		}

-		if (!(getLink().eContainer() instanceof Namespace)) {

-			return false;

-		}

-		Namespace source = (Namespace) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistElementImport_4009(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 {

-		getOldSource().getElementImports()

-				.remove(getLink());

-		getNewSource().getElementImports()

-				.add(getLink());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().setImportedElement(

-				getNewTarget()

-				);

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected ElementImport getLink() {

-		return (ElementImport) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Namespace getOldSource() {

-		return (Namespace) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Namespace getNewSource() {

-		return (Namespace) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected PackageableElement getOldTarget() {

-		return (PackageableElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected PackageableElement getNewTarget() {

-		return (PackageableElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationCreateCommand.java
deleted file mode 100644
index c9fd0cb97df..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 {

-

-	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_2006(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationCreateCommandCN.java
deleted file mode 100644
index c986e77729a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationCreateCommandCN.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 EnumerationCreateCommandCN extends EditElementCommand {

-

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

-

-				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_3025(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationLiteralCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationLiteralCreateCommand.java
deleted file mode 100644
index f845ae52f38..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationLiteralCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 EnumerationLiteralCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public EnumerationLiteralCreateCommand(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_3017(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationCreateCommand.java
deleted file mode 100644
index bf894a62b18..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationCreateCommand.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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

-	 */

-	public GeneralizationCreateCommand(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 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

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateGeneralization_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$

-		}

-

-		Generalization newElement = UMLFactory.eINSTANCE.createGeneralization();

-		getSource().getGeneralizations()

-				.add(newElement);

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

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationReorientCommand.java
deleted file mode 100644
index 832e01da6ab..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationReorientCommand.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistGeneralization_4002(getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Classifier && newEnd instanceof Classifier)) {

-			return false;

-		}

-		if (!(getLink().eContainer() instanceof Classifier)) {

-			return false;

-		}

-		Classifier source = (Classifier) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistGeneralization_4002(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 {

-		getOldSource().getGeneralizations()

-				.remove(getLink());

-		getNewSource().getGeneralizations()

-				.add(getLink());

-		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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationSetCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationSetCreateCommand.java
deleted file mode 100644
index fbca0a99410..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationSetCreateCommand.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Generalization;

-import org.eclipse.uml2.uml.GeneralizationSet;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class GeneralizationSetCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public GeneralizationSetCreateCommand(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 Generalization) {

-			return false;

-		}

-		if (target != null && false == target instanceof Generalization) {

-			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().canCreateGeneralizationSet_4020(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$

-		}

-

-		GeneralizationSet newElement = UMLFactory.eINSTANCE.createGeneralizationSet();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getGeneralizations()

-				.add(getSource());

-		newElement.getGeneralizations()

-				.add(getTarget());

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(GeneralizationSet 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 Generalization getSource() {

-		return (Generalization) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Generalization getTarget() {

-		return (Generalization) 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationSetReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationSetReorientCommand.java
deleted file mode 100644
index 05f3ed94fab..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationSetReorientCommand.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Generalization;

-import org.eclipse.uml2.uml.GeneralizationSet;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class GeneralizationSetReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public GeneralizationSetReorientCommand(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 GeneralizationSet) {

-			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 Generalization && newEnd instanceof Generalization)) {

-			return false;

-		}

-		if (getLink().getGeneralizations()

-				.size() != 1) {

-			return false;

-		}

-		Generalization target = (Generalization) getLink().getGeneralizations()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistGeneralizationSet_4020(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Generalization && newEnd instanceof Generalization)) {

-			return false;

-		}

-		if (getLink().getGeneralizations()

-				.size() != 1) {

-			return false;

-		}

-		Generalization source = (Generalization) getLink().getGeneralizations()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistGeneralizationSet_4020(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().getGeneralizations()

-				.remove(getOldSource());

-		getLink().getGeneralizations()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getGeneralizations()

-				.remove(getOldTarget());

-		getLink().getGeneralizations()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected GeneralizationSet getLink() {

-		return (GeneralizationSet) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Generalization getOldSource() {

-		return (Generalization) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Generalization getNewSource() {

-		return (Generalization) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Generalization getOldTarget() {

-		return (Generalization) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Generalization getNewTarget() {

-		return (Generalization) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InformationFlowCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InformationFlowCreateCommand.java
deleted file mode 100644
index 2f806280898..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InformationFlowCreateCommand.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.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_4026(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_4026(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InformationFlowReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InformationFlowReorientCommand.java
deleted file mode 100644
index fa41cb04e10..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InformationFlowReorientCommand.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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_4026(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_4026(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InformationItemCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InformationItemCreateCommand.java
deleted file mode 100644
index 4096587ccb3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InformationItemCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 {

-

-	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_2099(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InformationItemCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InformationItemCreateCommandCN.java
deleted file mode 100644
index 55efe96fec9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InformationItemCreateCommandCN.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 InformationItemCreateCommandCN extends EditElementCommand {

-

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

-

-				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_3040(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationCreateCommand.java
deleted file mode 100644
index f955ded7e1e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.InstanceSpecification;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InstanceSpecificationCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public InstanceSpecificationCreateCommand(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.getInstanceSpecification());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		InstanceSpecification newElement = UMLFactory.eINSTANCE.createInstanceSpecification();

-

-		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_InstanceSpecification_2001(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(InstanceSpecification 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationCreateCommandCN.java
deleted file mode 100644
index ba607a83485..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationCreateCommandCN.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.InstanceSpecification;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InstanceSpecificationCreateCommandCN extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public InstanceSpecificationCreateCommandCN(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.getInstanceSpecification());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		InstanceSpecification newElement = UMLFactory.eINSTANCE.createInstanceSpecification();

-

-		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_InstanceSpecification_3020(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(InstanceSpecification 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationLinkCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationLinkCreateCommand.java
deleted file mode 100644
index 6552123b023..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationLinkCreateCommand.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.InstanceSpecification;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Slot;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class InstanceSpecificationLinkCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public InstanceSpecificationLinkCreateCommand(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 Slot) {

-			return false;

-		}

-		if (target != null && false == target instanceof Slot) {

-			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().canCreateInstanceSpecification_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$

-		}

-

-		InstanceSpecification newElement = UMLFactory.eINSTANCE.createInstanceSpecification();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getSlots()

-				.add(getSource());

-		newElement.getSlots()

-				.add(getTarget());

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(InstanceSpecification 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 Slot getSource() {

-		return (Slot) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Slot getTarget() {

-		return (Slot) 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationLinkReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationLinkReorientCommand.java
deleted file mode 100644
index a16eaa75026..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationLinkReorientCommand.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.InstanceSpecification;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Slot;

-

-/**

- * @generated

- */

-public class InstanceSpecificationLinkReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public InstanceSpecificationLinkReorientCommand(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 InstanceSpecification) {

-			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 Slot && newEnd instanceof Slot)) {

-			return false;

-		}

-		if (getLink().getSlots()

-				.size() != 1) {

-			return false;

-		}

-		Slot target = (Slot) getLink().getSlots()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInstanceSpecification_4021(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Slot && newEnd instanceof Slot)) {

-			return false;

-		}

-		if (getLink().getSlots()

-				.size() != 1) {

-			return false;

-		}

-		Slot source = (Slot) getLink().getSlots()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInstanceSpecification_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().getSlots()

-				.remove(getOldSource());

-		getLink().getSlots()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSlots()

-				.remove(getOldTarget());

-		getLink().getSlots()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected InstanceSpecification getLink() {

-		return (InstanceSpecification) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Slot getOldSource() {

-		return (Slot) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Slot getNewSource() {

-		return (Slot) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Slot getOldTarget() {

-		return (Slot) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Slot getNewTarget() {

-		return (Slot) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceCreateCommand.java
deleted file mode 100644
index 93822a858bd..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 {

-

-	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_2004(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceCreateCommandCN.java
deleted file mode 100644
index 0e72d44617a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceCreateCommandCN.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 InterfaceCreateCommandCN extends EditElementCommand {

-

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

-

-				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_3023(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceRealizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceRealizationCreateCommand.java
deleted file mode 100644
index 0c0087f2ad2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceRealizationCreateCommand.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.BehavioredClassifier;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.InterfaceRealization;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class InterfaceRealizationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceRealizationCreateCommand(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 BehavioredClassifier) {

-			return false;

-		}

-		if (target != null && false == target instanceof Interface) {

-			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().canCreateInterfaceRealization_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$

-		}

-

-		InterfaceRealization newElement = UMLFactory.eINSTANCE.createInterfaceRealization();

-		getSource().getInterfaceRealizations()

-				.add(newElement);

-		newElement.setContract(

-				getTarget()

-				);

-		ElementInitializers.getInstance().init_InterfaceRealization_4003(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 BehavioredClassifier getSource() {

-		return (BehavioredClassifier) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Interface getTarget() {

-		return (Interface) target;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceRealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceRealizationReorientCommand.java
deleted file mode 100644
index 14edfb24e91..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceRealizationReorientCommand.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.BehavioredClassifier;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.InterfaceRealization;

-

-/**

- * @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 BehavioredClassifier && newEnd instanceof BehavioredClassifier)) {

-			return false;

-		}

-		Interface target = getLink().getContract();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInterfaceRealization_4003(getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Interface && newEnd instanceof Interface)) {

-			return false;

-		}

-		if (!(getLink().eContainer() instanceof BehavioredClassifier)) {

-			return false;

-		}

-		BehavioredClassifier source = (BehavioredClassifier) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInterfaceRealization_4003(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 {

-		getOldSource().getInterfaceRealizations()

-				.remove(getLink());

-		getNewSource().getInterfaceRealizations()

-				.add(getLink());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().setContract(

-				getNewTarget()

-				);

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected InterfaceRealization getLink() {

-		return (InterfaceRealization) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected BehavioredClassifier getOldSource() {

-		return (BehavioredClassifier) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected BehavioredClassifier getNewSource() {

-		return (BehavioredClassifier) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Interface getOldTarget() {

-		return (Interface) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Interface getNewTarget() {

-		return (Interface) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ModelCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ModelCreateCommandCN.java
deleted file mode 100644
index 5240286777f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ModelCreateCommandCN.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ModelCreateCommandCN extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ModelCreateCommandCN(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.getModel());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		Model newElement = UMLFactory.eINSTANCE.createModel();

-

-		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_Model_3024(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Model 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ModelCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ModelCreateCommandTN.java
deleted file mode 100644
index 99d90a2c3bc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ModelCreateCommandTN.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ModelCreateCommandTN extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ModelCreateCommandTN(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.getModel());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		Model newElement = UMLFactory.eINSTANCE.createModel();

-

-		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_Model_2005(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Model 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForClassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForClassCreateCommand.java
deleted file mode 100644
index 70f22e72c07..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForClassCreateCommand.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class NestedClassForClassCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedClassForClassCreateCommand(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_3014(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForComponentCreateCommand.java
deleted file mode 100644
index 2b3ead030b8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForComponentCreateCommand.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class NestedClassForComponentCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedClassForComponentCreateCommand(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_3004(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForInterfaceCreateCommand.java
deleted file mode 100644
index af30e790da2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForInterfaceCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 NestedClassForInterfaceCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedClassForInterfaceCreateCommand(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 {

-

-				Interface qualifiedTarget = (Interface) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_Class_3008(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedDataTypeForClassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedDataTypeForClassCreateCommand.java
deleted file mode 100644
index 763fb4a5d37..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedDataTypeForClassCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 NestedDataTypeForClassCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedDataTypeForClassCreateCommand(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_3044(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedDataTypeForComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedDataTypeForComponentCreateCommand.java
deleted file mode 100644
index 05865fbfe8e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedDataTypeForComponentCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 NestedDataTypeForComponentCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedDataTypeForComponentCreateCommand(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_3045(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedDataTypeForInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedDataTypeForInterfaceCreateCommand.java
deleted file mode 100644
index c53565d039b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedDataTypeForInterfaceCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class NestedDataTypeForInterfaceCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedDataTypeForInterfaceCreateCommand(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 {

-

-				Interface qualifiedTarget = (Interface) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_DataType_3043(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedEnumerationForClassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedEnumerationForClassCreateCommand.java
deleted file mode 100644
index 3eac3af4abf..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedEnumerationForClassCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 NestedEnumerationForClassCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedEnumerationForClassCreateCommand(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_3052(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedEnumerationForComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedEnumerationForComponentCreateCommand.java
deleted file mode 100644
index 1a931f73aa4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedEnumerationForComponentCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 NestedEnumerationForComponentCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedEnumerationForComponentCreateCommand(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_3053(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedEnumerationForInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedEnumerationForInterfaceCreateCommand.java
deleted file mode 100644
index 473f267b135..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedEnumerationForInterfaceCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class NestedEnumerationForInterfaceCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedEnumerationForInterfaceCreateCommand(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 {

-

-				Interface qualifiedTarget = (Interface) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_Enumeration_3054(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedInterfaceForClassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedInterfaceForClassCreateCommand.java
deleted file mode 100644
index 46d224f80d7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedInterfaceForClassCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 NestedInterfaceForClassCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedInterfaceForClassCreateCommand(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_3036(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedInterfaceForComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedInterfaceForComponentCreateCommand.java
deleted file mode 100644
index 2453310cc90..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedInterfaceForComponentCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 NestedInterfaceForComponentCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedInterfaceForComponentCreateCommand(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_3037(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedInterfaceForInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedInterfaceForInterfaceCreateCommand.java
deleted file mode 100644
index e908b0b0f8e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedInterfaceForInterfaceCreateCommand.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class NestedInterfaceForInterfaceCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedInterfaceForInterfaceCreateCommand(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 {

-

-				Interface qualifiedTarget = (Interface) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_Interface_3038(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedPrimitiveTypeForClassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedPrimitiveTypeForClassCreateCommand.java
deleted file mode 100644
index 79d5d7b7a4a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedPrimitiveTypeForClassCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 NestedPrimitiveTypeForClassCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedPrimitiveTypeForClassCreateCommand(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_3047(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedPrimitiveTypeForComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedPrimitiveTypeForComponentCreateCommand.java
deleted file mode 100644
index b2cb5ecb2c5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedPrimitiveTypeForComponentCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 NestedPrimitiveTypeForComponentCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedPrimitiveTypeForComponentCreateCommand(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_3046(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedPrimitiveTypeForInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedPrimitiveTypeForInterfaceCreateCommand.java
deleted file mode 100644
index 0d34de63844..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedPrimitiveTypeForInterfaceCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.PrimitiveType;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class NestedPrimitiveTypeForInterfaceCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedPrimitiveTypeForInterfaceCreateCommand(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 {

-

-				Interface qualifiedTarget = (Interface) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_PrimitiveType_3048(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedSignalForClassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedSignalForClassCreateCommand.java
deleted file mode 100644
index 78584b88ccc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedSignalForClassCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 NestedSignalForClassCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedSignalForClassCreateCommand(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_3050(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedSignalForComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedSignalForComponentCreateCommand.java
deleted file mode 100644
index 777b15ce8bc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedSignalForComponentCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 NestedSignalForComponentCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedSignalForComponentCreateCommand(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_3051(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedSignalForInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedSignalForInterfaceCreateCommand.java
deleted file mode 100644
index 3970bd30269..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedSignalForInterfaceCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.Signal;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class NestedSignalForInterfaceCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NestedSignalForInterfaceCreateCommand(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 {

-

-				Interface qualifiedTarget = (Interface) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_Signal_3049(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForClassCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForClassCommand.java
deleted file mode 100644
index e4942f9b811..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForClassCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 OperationForClassCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public OperationForClassCommand(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_3013(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForComponentCreateCommand.java
deleted file mode 100644
index 4274f2a4404..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForComponentCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 OperationForComponentCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public OperationForComponentCreateCommand(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_3003(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForDataTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForDataTypeCreateCommand.java
deleted file mode 100644
index a6c0b05f715..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForDataTypeCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Operation;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class OperationForDataTypeCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public OperationForDataTypeCreateCommand(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 {

-

-				DataType qualifiedTarget = (DataType) target;

-				qualifiedTarget.getOwnedOperations()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_Operation_3019(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForInterfaceCreateCommand.java
deleted file mode 100644
index 0116e32c8e4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForInterfaceCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.Operation;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class OperationForInterfaceCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public OperationForInterfaceCreateCommand(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 {

-

-				Interface qualifiedTarget = (Interface) target;

-				qualifiedTarget.getOwnedOperations()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_Operation_3007(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForPrimitiveTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForPrimitiveTypeCreateCommand.java
deleted file mode 100644
index dbf658d49c3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForPrimitiveTypeCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Operation;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class OperationForPrimitiveTypeCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public OperationForPrimitiveTypeCreateCommand(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 {

-

-				DataType qualifiedTarget = (DataType) target;

-				qualifiedTarget.getOwnedOperations()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_Operation_3042(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationTemplateParameterCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationTemplateParameterCreateCommand.java
deleted file mode 100644
index b624b62bc23..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationTemplateParameterCreateCommand.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.OperationTemplateParameter;

-import org.eclipse.uml2.uml.TemplateSignature;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class OperationTemplateParameterCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public OperationTemplateParameterCreateCommand(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.getOperationTemplateParameter());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		OperationTemplateParameter newElement = UMLFactory.eINSTANCE.createOperationTemplateParameter();

-

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

-

-				TemplateSignature qualifiedTarget = (TemplateSignature) target;

-				qualifiedTarget.getOwnedParameters()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		TemplateSignature childHolder = (TemplateSignature) getElementToEdit();

-		childHolder.getParameters()

-				.add(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(OperationTemplateParameter 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageCreateCommand.java
deleted file mode 100644
index 4dc86c1d8c5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageCreateCommand.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PackageCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PackageCreateCommand(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.getPackage());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		Package newElement = UMLFactory.eINSTANCE.createPackage();

-

-		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_Package_2007(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Package 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageCreateCommandCN.java
deleted file mode 100644
index a474b37035c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageCreateCommandCN.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PackageCreateCommandCN extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PackageCreateCommandCN(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.getPackage());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		Package newElement = UMLFactory.eINSTANCE.createPackage();

-

-		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_Package_3009(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Package 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageImportCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageImportCreateCommand.java
deleted file mode 100644
index a85a4b00a9f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageImportCreateCommand.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.PackageImport;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class PackageImportCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	public PackageImportCreateCommand(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 Namespace) {

-			return false;

-		}

-		if (target != null && false == target instanceof Package) {

-			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().canCreatePackageImport_4010(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$

-		}

-

-		PackageImport newElement = UMLFactory.eINSTANCE.createPackageImport();

-		getSource().getPackageImports()

-				.add(newElement);

-		newElement.setImportedPackage(

-				getTarget()

-				);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(PackageImport 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 Namespace getSource() {

-		return (Namespace) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Package getTarget() {

-		return (Package) target;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageImportReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageImportReorientCommand.java
deleted file mode 100644
index ba4a6dcef13..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageImportReorientCommand.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.PackageImport;

-

-/**

- * @generated

- */

-public class PackageImportReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public PackageImportReorientCommand(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 PackageImport) {

-			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 Namespace && newEnd instanceof Namespace)) {

-			return false;

-		}

-		Package target = getLink().getImportedPackage();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistPackageImport_4010(getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Package && newEnd instanceof Package)) {

-			return false;

-		}

-		if (!(getLink().eContainer() instanceof Namespace)) {

-			return false;

-		}

-		Namespace source = (Namespace) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistPackageImport_4010(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 {

-		getOldSource().getPackageImports()

-				.remove(getLink());

-		getNewSource().getPackageImports()

-				.add(getLink());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().setImportedPackage(

-				getNewTarget()

-				);

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected PackageImport getLink() {

-		return (PackageImport) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Namespace getOldSource() {

-		return (Namespace) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Namespace getNewSource() {

-		return (Namespace) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Package getOldTarget() {

-		return (Package) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Package getNewTarget() {

-		return (Package) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageMergeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageMergeCreateCommand.java
deleted file mode 100644
index f2c7babdfb9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageMergeCreateCommand.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.PackageMerge;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class PackageMergeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public PackageMergeCreateCommand(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 Package) {

-			return false;

-		}

-		if (target != null && false == target instanceof Package) {

-			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().canCreatePackageMerge_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$

-		}

-

-		PackageMerge newElement = UMLFactory.eINSTANCE.createPackageMerge();

-		getContainer().getPackageMerges()

-				.add(newElement);

-		newElement.setReceivingPackage(

-				getSource()

-				);

-		newElement.setMergedPackage(

-				getTarget()

-				);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(PackageMerge 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 Package getSource() {

-		return (Package) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Package getTarget() {

-		return (Package) 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageMergeReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageMergeReorientCommand.java
deleted file mode 100644
index d47c3300be0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageMergeReorientCommand.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.PackageMerge;

-

-/**

- * @generated

- */

-public class PackageMergeReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public PackageMergeReorientCommand(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 PackageMerge) {

-			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 Package && newEnd instanceof Package)) {

-			return false;

-		}

-		Package target = getLink().getMergedPackage();

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistPackageMerge_4011(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Package && newEnd instanceof Package)) {

-			return false;

-		}

-		Package source = getLink().getReceivingPackage();

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistPackageMerge_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().setReceivingPackage(

-				getNewSource()

-				);

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().setMergedPackage(

-				getNewTarget()

-				);

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected PackageMerge getLink() {

-		return (PackageMerge) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Package getOldSource() {

-		return (Package) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Package getNewSource() {

-		return (Package) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Package getOldTarget() {

-		return (Package) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Package getNewTarget() {

-		return (Package) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PrimitiveTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PrimitiveTypeCreateCommand.java
deleted file mode 100644
index a3f80dee835..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PrimitiveTypeCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 {

-

-	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_2009(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PrimitiveTypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PrimitiveTypeCreateCommandCN.java
deleted file mode 100644
index d1719104c7b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PrimitiveTypeCreateCommandCN.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 PrimitiveTypeCreateCommandCN extends EditElementCommand {

-

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

-

-				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_3026(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ProfileApplicationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ProfileApplicationCreateCommand.java
deleted file mode 100644
index 5854cdeb012..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ProfileApplicationCreateCommand.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.ProfileApplication;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class ProfileApplicationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	public ProfileApplicationCreateCommand(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 Package) {

-			return false;

-		}

-		if (target != null && false == target instanceof Profile) {

-			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().canCreateProfileApplication_4012(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$

-		}

-

-		ProfileApplication newElement = UMLFactory.eINSTANCE.createProfileApplication();

-		getSource().getProfileApplications()

-				.add(newElement);

-		newElement.setAppliedProfile(

-				getTarget()

-				);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(ProfileApplication 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 Package getSource() {

-		return (Package) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Profile getTarget() {

-		return (Profile) target;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ProfileApplicationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ProfileApplicationReorientCommand.java
deleted file mode 100644
index 4cc4c618b8d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ProfileApplicationReorientCommand.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.ProfileApplication;

-

-/**

- * @generated

- */

-public class ProfileApplicationReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public ProfileApplicationReorientCommand(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 ProfileApplication) {

-			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 Package && newEnd instanceof Package)) {

-			return false;

-		}

-		Profile target = getLink().getAppliedProfile();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistProfileApplication_4012(getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Profile && newEnd instanceof Profile)) {

-			return false;

-		}

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package source = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistProfileApplication_4012(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 {

-		getOldSource().getProfileApplications()

-				.remove(getLink());

-		getNewSource().getProfileApplications()

-				.add(getLink());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().setAppliedProfile(

-				getNewTarget()

-				);

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected ProfileApplication getLink() {

-		return (ProfileApplication) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Package getOldSource() {

-		return (Package) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Package getNewSource() {

-		return (Package) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Profile getOldTarget() {

-		return (Profile) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Profile getNewTarget() {

-		return (Profile) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForClassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForClassCreateCommand.java
deleted file mode 100644
index 896f14da4d7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForClassCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 PropertyForClassCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PropertyForClassCreateCommand(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_3012(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForComponentCreateCommand.java
deleted file mode 100644
index 83c70d6c715..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForComponentCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 PropertyForComponentCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PropertyForComponentCreateCommand(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_3002(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForInterfaceCreateCommand.java
deleted file mode 100644
index d21afd2b65f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForInterfaceCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PropertyForInterfaceCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PropertyForInterfaceCreateCommand(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 {

-

-				Interface qualifiedTarget = (Interface) target;

-				qualifiedTarget.getOwnedAttributes()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_Property_3006(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForSignalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForSignalCreateCommand.java
deleted file mode 100644
index 61d45785bdb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForSignalCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Signal;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PropertyForSignalCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PropertyForSignalCreateCommand(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 {

-

-				Signal qualifiedTarget = (Signal) target;

-				qualifiedTarget.getOwnedAttributes()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_Property_3005(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyforDataTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyforDataTypeCreateCommand.java
deleted file mode 100644
index 558ff86a4b1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyforDataTypeCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PropertyforDataTypeCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PropertyforDataTypeCreateCommand(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 {

-

-				DataType qualifiedTarget = (DataType) target;

-				qualifiedTarget.getOwnedAttributes()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_Property_3018(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyforPrimitiveTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyforPrimitiveTypeCreateCommand.java
deleted file mode 100644
index 95de14f9312..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyforPrimitiveTypeCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PropertyforPrimitiveTypeCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PropertyforPrimitiveTypeCreateCommand(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 {

-

-				DataType qualifiedTarget = (DataType) target;

-				qualifiedTarget.getOwnedAttributes()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_Property_3041(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RealizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RealizationCreateCommand.java
deleted file mode 100644
index b36093e977c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RealizationCreateCommand.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.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_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$

-		}

-

-		Realization newElement = UMLFactory.eINSTANCE.createRealization();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Realization_4005(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RealizationReorientCommand.java
deleted file mode 100644
index 5421fd93c48..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RealizationReorientCommand.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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_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().canExistRealization_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 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ReceptionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ReceptionCreateCommand.java
deleted file mode 100644
index 04a3f2e358f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ReceptionCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Reception;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ReceptionCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ReceptionCreateCommand(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.getReception());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		Reception newElement = UMLFactory.eINSTANCE.createReception();

-

-		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.getOwnedReceptions()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_Reception_3011(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Reception 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ReceptionInInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ReceptionInInterfaceCreateCommand.java
deleted file mode 100644
index d0f1d24b15c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ReceptionInInterfaceCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.Reception;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ReceptionInInterfaceCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ReceptionInInterfaceCreateCommand(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.getReception());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		Reception newElement = UMLFactory.eINSTANCE.createReception();

-

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

-

-				Interface qualifiedTarget = (Interface) target;

-				qualifiedTarget.getOwnedReceptions()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_Reception_3039(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Reception 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RedefinableTemplateSignatureCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RedefinableTemplateSignatureCreateCommand.java
deleted file mode 100644
index a048f6c1a07..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RedefinableTemplateSignatureCreateCommand.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.RedefinableTemplateSignature;

-import org.eclipse.uml2.uml.TemplateableElement;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class RedefinableTemplateSignatureCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public RedefinableTemplateSignatureCreateCommand(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() {

-		TemplateableElement container = (TemplateableElement) getElementToEdit();

-		if (container.getOwnedTemplateSignature()

-				!= null) {

-			return false;

-		}

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getRedefinableTemplateSignature());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		RedefinableTemplateSignature newElement = UMLFactory.eINSTANCE.createRedefinableTemplateSignature();

-

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

-

-				TemplateableElement qualifiedTarget = (TemplateableElement) target;

-				qualifiedTarget.setOwnedTemplateSignature(

-						newElement

-						);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		ElementInitializers.getInstance().init_RedefinableTemplateSignature_3015(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(RedefinableTemplateSignature 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ShortCutDiagramCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ShortCutDiagramCreateCommand.java
deleted file mode 100644
index 82938b6b067..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ShortCutDiagramCreateCommand.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.emf.ecore.resource.Resource;

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

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

-

-/**

- * @generated

- */

-public class ShortCutDiagramCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ShortCutDiagramCreateCommand(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() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		// Uncomment to put "phantom" objects into the diagram file.		

-		// org.eclipse.emf.ecore.resource.Resource resource = 

-		// 		((org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest) getRequest()).getContainer().eResource();

-		// if (resource == null) {

-		// 	return null;

-		// }

-		Resource resource = getElementToEdit().eResource();

-		Diagram newElement = NotationFactory.eINSTANCE.createDiagram();

-		resource.getContents().add(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Diagram 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SignalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SignalCreateCommand.java
deleted file mode 100644
index 9a0530f1a62..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SignalCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 {

-

-	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_2003(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SignalCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SignalCreateCommandCN.java
deleted file mode 100644
index a869514479b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SignalCreateCommandCN.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 SignalCreateCommandCN extends EditElementCommand {

-

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

-

-				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_3022(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SlotCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SlotCreateCommand.java
deleted file mode 100644
index d9e67e1cd80..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SlotCreateCommand.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.InstanceSpecification;

-import org.eclipse.uml2.uml.Slot;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class SlotCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public SlotCreateCommand(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.getSlot());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		Slot newElement = UMLFactory.eINSTANCE.createSlot();

-

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

-

-				InstanceSpecification qualifiedTarget = (InstanceSpecification) target;

-				qualifiedTarget.getSlots()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Slot 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SubstitutionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SubstitutionCreateCommand.java
deleted file mode 100644
index 7f444870eac..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SubstitutionCreateCommand.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Classifier;

-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 Classifier 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 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().canCreateSubstitution_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$

-		}

-

-		Substitution newElement = UMLFactory.eINSTANCE.createSubstitution();

-		getContainer().getSubstitutions()

-				.add(newElement);

-		newElement.setSubstitutingClassifier(

-				getSource()

-				);

-		newElement.setContract(

-				getTarget()

-				);

-		ElementInitializers.getInstance().init_Substitution_4004(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 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SubstitutionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SubstitutionReorientCommand.java
deleted file mode 100644
index e2c56e118f2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SubstitutionReorientCommand.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Classifier;

-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 Classifier && newEnd instanceof Classifier)) {

-			return false;

-		}

-		Classifier target = getLink().getContract();

-		if (!(getLink().eContainer() instanceof Classifier)) {

-			return false;

-		}

-		Classifier container = (Classifier) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistSubstitution_4004(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Classifier && newEnd instanceof Classifier)) {

-			return false;

-		}

-		Classifier source = getLink().getSubstitutingClassifier();

-		if (!(getLink().eContainer() instanceof Classifier)) {

-			return false;

-		}

-		Classifier container = (Classifier) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistSubstitution_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().setSubstitutingClassifier(

-				getNewSource()

-				);

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().setContract(

-				getNewTarget()

-				);

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Substitution getLink() {

-		return (Substitution) 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateBindingCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateBindingCreateCommand.java
deleted file mode 100644
index a4ce03ecb61..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateBindingCreateCommand.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.TemplateBinding;

-import org.eclipse.uml2.uml.TemplateableElement;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class TemplateBindingCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected TemplateableElement container;

-

-	/**

-	 * @generated

-	 */

-	public TemplateBindingCreateCommand(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 TemplateableElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof TemplateableElement) {

-			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().canCreateTemplateBinding_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$

-		}

-

-		TemplateBinding newElement = UMLFactory.eINSTANCE.createTemplateBinding();

-		getContainer().getTemplateBindings()

-				.add(newElement);

-		newElement.setBoundElement(

-				getSource()

-				);

-		newElement.setBoundElement(

-				getTarget()

-				);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(TemplateBinding 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 TemplateableElement getSource() {

-		return (TemplateableElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected TemplateableElement getTarget() {

-		return (TemplateableElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public TemplateableElement getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 * @generated

-	 */

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

-				return (TemplateableElement) element;

-			}

-		}

-		return null;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateBindingReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateBindingReorientCommand.java
deleted file mode 100644
index aabdc2123ac..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateBindingReorientCommand.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.TemplateBinding;

-import org.eclipse.uml2.uml.TemplateableElement;

-

-/**

- * @generated

- */

-public class TemplateBindingReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public TemplateBindingReorientCommand(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 TemplateBinding) {

-			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 TemplateableElement && newEnd instanceof TemplateableElement)) {

-			return false;

-		}

-		TemplateableElement target = getLink().getBoundElement();

-		if (!(getLink().eContainer() instanceof TemplateableElement)) {

-			return false;

-		}

-		TemplateableElement container = (TemplateableElement) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistTemplateBinding_4015(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof TemplateableElement && newEnd instanceof TemplateableElement)) {

-			return false;

-		}

-		TemplateableElement source = getLink().getBoundElement();

-		if (!(getLink().eContainer() instanceof TemplateableElement)) {

-			return false;

-		}

-		TemplateableElement container = (TemplateableElement) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistTemplateBinding_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().setBoundElement(

-				getNewSource()

-				);

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().setBoundElement(

-				getNewTarget()

-				);

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected TemplateBinding getLink() {

-		return (TemplateBinding) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected TemplateableElement getOldSource() {

-		return (TemplateableElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected TemplateableElement getNewSource() {

-		return (TemplateableElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected TemplateableElement getOldTarget() {

-		return (TemplateableElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected TemplateableElement getNewTarget() {

-		return (TemplateableElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateParameterCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateParameterCreateCommand.java
deleted file mode 100644
index df6032a3145..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateParameterCreateCommand.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.TemplateParameter;

-import org.eclipse.uml2.uml.TemplateSignature;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class TemplateParameterCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public TemplateParameterCreateCommand(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.getTemplateParameter());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		TemplateParameter newElement = UMLFactory.eINSTANCE.createTemplateParameter();

-

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

-

-				TemplateSignature qualifiedTarget = (TemplateSignature) target;

-				qualifiedTarget.getOwnedParameters()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		TemplateSignature childHolder = (TemplateSignature) getElementToEdit();

-		childHolder.getParameters()

-				.add(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(TemplateParameter 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateSignatureCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateSignatureCreateCommand.java
deleted file mode 100644
index f8aa0eecf2a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateSignatureCreateCommand.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.TemplateSignature;

-import org.eclipse.uml2.uml.TemplateableElement;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class TemplateSignatureCreateCommand extends EditElementCommand {

-

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public TemplateSignatureCreateCommand(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() {

-		TemplateableElement container = (TemplateableElement) getElementToEdit();

-		if (container.getOwnedTemplateSignature()

-				!= null) {

-			return false;

-		}

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTemplateSignature());

-		return data.isPermitted();

-

-	}

-

-	/**

-	 * @generated

-	 */

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

-

-		TemplateSignature newElement = UMLFactory.eINSTANCE.createTemplateSignature();

-

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

-

-				TemplateableElement qualifiedTarget = (TemplateableElement) target;

-				qualifiedTarget.setOwnedTemplateSignature(

-						newElement

-						);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(TemplateSignature 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TimeObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TimeObservationCreateCommand.java
deleted file mode 100644
index 613ed17cf51..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TimeObservationCreateCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 {

-

-	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_2096(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/UsageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/UsageCreateCommand.java
deleted file mode 100644
index 16a8dd6e69c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/UsageCreateCommand.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.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_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$

-		}

-

-		Usage newElement = UMLFactory.eINSTANCE.createUsage();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Usage_4007(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/UsageReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/UsageReorientCommand.java
deleted file mode 100644
index e264f56f0a1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/UsageReorientCommand.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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_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().canExistUsage_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 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/AbstractionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/AbstractionEditHelper.java
deleted file mode 100644
index 200e6c7b11d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/AbstractionEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class AbstractionEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/AssociationClassEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/AssociationClassEditHelper.java
deleted file mode 100644
index 1a3a0bfc1cd..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/AssociationClassEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class AssociationClassEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/AssociationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/AssociationEditHelper.java
deleted file mode 100644
index b13b644c653..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/AssociationEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class AssociationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ClassEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ClassEditHelper.java
deleted file mode 100644
index 58d6b5047d4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ClassEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class ClassEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ClassifierTemplateParameterEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ClassifierTemplateParameterEditHelper.java
deleted file mode 100644
index a6b91714da6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ClassifierTemplateParameterEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class ClassifierTemplateParameterEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/CommentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/CommentEditHelper.java
deleted file mode 100644
index fe57cf6b492..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/CommentEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class CommentEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ComponentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ComponentEditHelper.java
deleted file mode 100644
index fa186b74c84..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ComponentEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class ComponentEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ConstraintEditHelper.java
deleted file mode 100644
index d7cc636f01b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ConstraintEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class ConstraintEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DataTypeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DataTypeEditHelper.java
deleted file mode 100644
index c740c01ab47..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DataTypeEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class DataTypeEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DefaultNamedElementEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DefaultNamedElementEditHelper.java
deleted file mode 100644
index 7761f390b31..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DefaultNamedElementEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class DefaultNamedElementEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DependencyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DependencyEditHelper.java
deleted file mode 100644
index 5b97a8af47a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DependencyEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class DependencyEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DurationObservationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DurationObservationEditHelper.java
deleted file mode 100644
index d04d1f46989..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DurationObservationEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class DurationObservationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ElementImportEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ElementImportEditHelper.java
deleted file mode 100644
index 3e7ef3137a0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ElementImportEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class ElementImportEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/EnumerationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/EnumerationEditHelper.java
deleted file mode 100644
index 53c5fc456ec..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/EnumerationEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class EnumerationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/EnumerationLiteralEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/EnumerationLiteralEditHelper.java
deleted file mode 100644
index fa192ed48b8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/EnumerationLiteralEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class EnumerationLiteralEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/GeneralizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/GeneralizationEditHelper.java
deleted file mode 100644
index 21f36480c98..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/GeneralizationEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class GeneralizationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/GeneralizationSetEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/GeneralizationSetEditHelper.java
deleted file mode 100644
index df04c7c8dbc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/GeneralizationSetEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class GeneralizationSetEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InformationFlowEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InformationFlowEditHelper.java
deleted file mode 100644
index 7b8725bf177..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InformationFlowEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class InformationFlowEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InformationItemEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InformationItemEditHelper.java
deleted file mode 100644
index 6b9d5853079..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InformationItemEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class InformationItemEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InstanceSpecificationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InstanceSpecificationEditHelper.java
deleted file mode 100644
index 7a72372e776..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InstanceSpecificationEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class InstanceSpecificationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InstanceSpecificationLinkEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InstanceSpecificationLinkEditHelper.java
deleted file mode 100644
index 03be5ce6ed8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InstanceSpecificationLinkEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class InstanceSpecificationLinkEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InterfaceEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InterfaceEditHelper.java
deleted file mode 100644
index ef86cb0bd5f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InterfaceEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class InterfaceEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InterfaceRealizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InterfaceRealizationEditHelper.java
deleted file mode 100644
index 2060b7be9a8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InterfaceRealizationEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class InterfaceRealizationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ModelEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ModelEditHelper.java
deleted file mode 100644
index c22764dc2a0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ModelEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class ModelEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/OperationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/OperationEditHelper.java
deleted file mode 100644
index 5200e457bb0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/OperationEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class OperationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PackageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PackageEditHelper.java
deleted file mode 100644
index 95eff40476a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PackageEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class PackageEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PackageImportEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PackageImportEditHelper.java
deleted file mode 100644
index c2fbd5ae095..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PackageImportEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class PackageImportEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PackageMergeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PackageMergeEditHelper.java
deleted file mode 100644
index c9313fed2b3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PackageMergeEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class PackageMergeEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PrimitiveTypeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PrimitiveTypeEditHelper.java
deleted file mode 100644
index 880e535311b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PrimitiveTypeEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class PrimitiveTypeEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ProfileApplicationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ProfileApplicationEditHelper.java
deleted file mode 100644
index 5ac32b0c279..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ProfileApplicationEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class ProfileApplicationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PropertyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PropertyEditHelper.java
deleted file mode 100644
index 66cc1603683..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PropertyEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class PropertyEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/RealizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/RealizationEditHelper.java
deleted file mode 100644
index 13e69549eb1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/RealizationEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class RealizationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ReceptionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ReceptionEditHelper.java
deleted file mode 100644
index 6bd3363ae60..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ReceptionEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class ReceptionEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/RedefinableTemplateSignatureEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/RedefinableTemplateSignatureEditHelper.java
deleted file mode 100644
index 6e05adfc36b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/RedefinableTemplateSignatureEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class RedefinableTemplateSignatureEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ShortCutDiagramEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ShortCutDiagramEditHelper.java
deleted file mode 100644
index 56913ba6461..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ShortCutDiagramEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class ShortCutDiagramEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/SignalEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/SignalEditHelper.java
deleted file mode 100644
index b21f5ff3f37..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/SignalEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class SignalEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/SlotEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/SlotEditHelper.java
deleted file mode 100644
index 7abf5225cee..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/SlotEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class SlotEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/SubstitutionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/SubstitutionEditHelper.java
deleted file mode 100644
index cfd6b412f97..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/SubstitutionEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class SubstitutionEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/TemplateBindingEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/TemplateBindingEditHelper.java
deleted file mode 100644
index 098e98a8650..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/TemplateBindingEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class TemplateBindingEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/TemplateParameterEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/TemplateParameterEditHelper.java
deleted file mode 100644
index 37d014e0e1a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/TemplateParameterEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class TemplateParameterEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/TimeObservationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/TimeObservationEditHelper.java
deleted file mode 100644
index ff08599a0a8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/TimeObservationEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class TimeObservationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/UMLBaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/UMLBaseEditHelper.java
deleted file mode 100644
index f1966a8881f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/UMLBaseEditHelper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/UsageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/UsageEditHelper.java
deleted file mode 100644
index 5af8c4fca25..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/UsageEditHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

-

-/**

- * @generated

- */

-public class UsageEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionEditPart.java
deleted file mode 100644
index 95590decbc2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionEditPart.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomAbstractionItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AbstractionItemSemanticEditPolicy;

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

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

-

-/**

- * @generated

- */

-public class AbstractionEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4006;

-

-	/**

-	 * @generated

-	 */

-	public AbstractionEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AbstractionItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeAbstractionLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomAbstractionItemSemanticEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AbstractionNameEditPart) {

-			((AbstractionNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

-			return true;

-		}

-		if (childEditPart instanceof AppliedStereotypeAbstractionEditPart) {

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

-			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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionNameEditPart.java
deleted file mode 100644
index d690cc8a240..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionNameEditPart.java
+++ /dev/null
@@ -1,788 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 6014;

-

-	/**

-	 * @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.clazz.edit.parts.AbstractionNameEditPart.VISUAL_ID), new Point(0, 40));

-	}

-

-	/**

-	 * @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_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAbstractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAbstractionEditPart.java
deleted file mode 100644
index 3930028a509..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAbstractionEditPart.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 AppliedStereotypeAbstractionEditPart 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.clazz.edit.parts.AppliedStereotypeAbstractionEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AppliedStereotypeAbstractionEditPart(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_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeAbstractionEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAssociationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAssociationEditPart.java
deleted file mode 100644
index c139611964e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAssociationEditPart.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 AppliedStereotypeAssociationEditPart 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.clazz.edit.parts.AppliedStereotypeAssociationEditPart.VISUAL_ID), new Point(0, -20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AppliedStereotypeAssociationEditPart(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.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeAssociationEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeDependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeDependencyEditPart.java
deleted file mode 100644
index 25943f0334c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeDependencyEditPart.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 AppliedStereotypeDependencyEditPart 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.clazz.edit.parts.AppliedStereotypeDependencyEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AppliedStereotypeDependencyEditPart(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_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeDependencyEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeElementImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeElementImportEditPart.java
deleted file mode 100644
index 1bfe348320d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeElementImportEditPart.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 AppliedStereotypeElementImportEditPart 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.clazz.edit.parts.AppliedStereotypeElementImportEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AppliedStereotypeElementImportEditPart(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.ElementImport_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeElementImportEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeGeneralizationSetLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeGeneralizationSetLabelEditPart.java
deleted file mode 100644
index 4e249b60c60..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeGeneralizationSetLabelEditPart.java
+++ /dev/null
@@ -1,788 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart

-{

-

-	/**

-	 * @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

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeGeneralizationSetLabelEditPart.VISUAL_ID), new Point(0, 40));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AppliedStereotypeGeneralizationSetLabelEditPart(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.GeneralizationSet_4020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeGeneralizationSetLabelEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeInterfaceRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeInterfaceRealizationEditPart.java
deleted file mode 100644
index 5daf0ea8acb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeInterfaceRealizationEditPart.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 AppliedStereotypeInterfaceRealizationEditPart 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.clazz.edit.parts.AppliedStereotypeInterfaceRealizationEditPart.VISUAL_ID), new Point(0, 40));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AppliedStereotypeInterfaceRealizationEditPart(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_4003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeInterfaceRealizationEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageImportEditPart.java
deleted file mode 100644
index 223a9d2a0c5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageImportEditPart.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 AppliedStereotypePackageImportEditPart 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.clazz.edit.parts.AppliedStereotypePackageImportEditPart.VISUAL_ID), new Point(0, 40));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AppliedStereotypePackageImportEditPart(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.PackageImport_4010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageImportEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageMergeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageMergeEditPart.java
deleted file mode 100644
index f2e1c5d2e78..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageMergeEditPart.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 AppliedStereotypePackageMergeEditPart 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.clazz.edit.parts.AppliedStereotypePackageMergeEditPart.VISUAL_ID), new Point(0, 40));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AppliedStereotypePackageMergeEditPart(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.PackageMerge_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageMergeEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeRealizationEditPart.java
deleted file mode 100644
index 34f6a44fb55..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeRealizationEditPart.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6012;

-

-	/**

-	 * @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.clazz.edit.parts.AppliedStereotypeRealizationEditPart.VISUAL_ID), new Point(0, 40));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AppliedStereotypeRealizationEditPart(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_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeRealizationEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeSubstitutionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeSubstitutionEditPart.java
deleted file mode 100644
index 817f70de6b8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeSubstitutionEditPart.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6010;

-

-	/**

-	 * @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.clazz.edit.parts.AppliedStereotypeSubstitutionEditPart.VISUAL_ID), new Point(0, 40));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AppliedStereotypeSubstitutionEditPart(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_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeSubstitutionEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeTemplateBindingEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeTemplateBindingEditPart.java
deleted file mode 100644
index ade2b301a78..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeTemplateBindingEditPart.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart

-{

-

-	/**

-	 * @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

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeTemplateBindingEditPart.VISUAL_ID), new Point(0, 20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AppliedStereotypeTemplateBindingEditPart(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.TemplateBinding_4015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeTemplateBindingEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeUsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeUsageEditPart.java
deleted file mode 100644
index b86df8d234c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeUsageEditPart.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 AppliedStereotypeUsageEditPart 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.clazz.edit.parts.AppliedStereotypeUsageEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AppliedStereotypeUsageEditPart(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_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeUsageEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotyperGeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotyperGeneralizationEditPart.java
deleted file mode 100644
index a9d0b185a54..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotyperGeneralizationEditPart.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 AppliedStereotyperGeneralizationEditPart 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.clazz.edit.parts.AppliedStereotyperGeneralizationEditPart.VISUAL_ID), new Point(0, 40));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AppliedStereotyperGeneralizationEditPart(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_4002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotyperGeneralizationEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchEditPart.java
deleted file mode 100644
index 8b5f58d0a89..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchEditPart.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractAssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.AssociationFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomAssociationBranchItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationBranchItemSemanticEditPolicy;

-

-/**

- * @generated

- */

-public class AssociationBranchEditPart extends AbstractAssociationBranchEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4019;

-

-	/**

-	 * @generated

-	 */

-	public AssociationBranchEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AssociationBranchItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomAssociationBranchItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AssociationBranchRoleEditPart) {

-			((AssociationBranchRoleEditPart) childEditPart).setLabel(

-					getPrimaryShape().getRoleSourceLabel());

-			return true;

-		}

-		if (childEditPart instanceof AssociationBranchMutliplicityEditPart) {

-			((AssociationBranchMutliplicityEditPart) childEditPart).setLabel(

-					getPrimaryShape().getMultiplicitySourceLabel());

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

-			return true;

-		}

-		if (childEditPart instanceof AssociationBranchMutliplicityEditPart) {

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

-	}

-

-	/**

-	 * @generated

-	 */

-	public AssociationFigure getPrimaryShape() {

-		return (AssociationFigure) getFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchMutliplicityEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchMutliplicityEditPart.java
deleted file mode 100644
index 3d6951c4af9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchMutliplicityEditPart.java
+++ /dev/null
@@ -1,782 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndTargetMultiplicityEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart

-{

-

-	/**

-	 * @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

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchMutliplicityEditPart.VISUAL_ID), new Point(0, 20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AssociationBranchMutliplicityEditPart(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(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new DisplayAssociationEndTargetMultiplicityEditPolicy());

-	}

-

-	/**

-	 * @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.Association_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchMutliplicityEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchRoleEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchRoleEditPart.java
deleted file mode 100644
index 1e82327e8a9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchRoleEditPart.java
+++ /dev/null
@@ -1,782 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndTargetEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 AssociationBranchRoleEditPart 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.clazz.edit.parts.AssociationBranchRoleEditPart.VISUAL_ID), new Point(0, -20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AssociationBranchRoleEditPart(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(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new DisplayAssociationEndTargetEditPolicy());

-	}

-

-	/**

-	 * @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.Association_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchRoleEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassAttributeCompartmentEditPart.java
deleted file mode 100644
index d17c340a081..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassAttributeCompartmentEditPart.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassAttributeCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class AssociationClassAttributeCompartmentEditPart

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7034;

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassAttributeCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.AssociationClassAttributeCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AssociationClassAttributeCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassAttributeCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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_3002) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassDashedLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassDashedLinkEditPart.java
deleted file mode 100644
index 547a5f4e0d1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassDashedLinkEditPart.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

-

-/**

- * @generated

- */

-public class AssociationClassDashedLinkEditPart extends ConnectionEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4016;

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassDashedLinkEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy());

-		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-	}

-

-	/**

-	 * 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java
deleted file mode 100644
index db0e6540459..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomAssociationClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class AssociationClassEditPart extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2013;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AssociationClassItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomAssociationClassItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		// 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 ClassifierFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure

-	 * @generated

-	 */

-	public ClassifierFigure getPrimaryShape() {

-		return (ClassifierFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AssociationClassNameEditPart) {

-			((AssociationClassNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

-			return true;

-		}

-

-		if (childEditPart instanceof AssociationClassAttributeCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((AssociationClassAttributeCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof AssociationClassOperationCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((AssociationClassOperationCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof AssociationClassNestedClassifierCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getNestedClassifierFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((AssociationClassNestedClassifierCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AssociationClassNameEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof AssociationClassAttributeCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			pane.remove(((AssociationClassAttributeCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof AssociationClassOperationCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			pane.remove(((AssociationClassOperationCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof AssociationClassNestedClassifierCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getNestedClassifierFigure();

-			pane.remove(((AssociationClassNestedClassifierCompartmentEditPart) 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 AssociationClassAttributeCompartmentEditPart) {

-			return getPrimaryShape().getAttributeCompartmentFigure();

-		}

-		if (editPart instanceof AssociationClassOperationCompartmentEditPart) {

-			return getPrimaryShape().getOperationCompartmentFigure();

-		}

-		if (editPart instanceof AssociationClassNestedClassifierCompartmentEditPart) {

-			return getPrimaryShape().getNestedClassifierFigure();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "AssociationClass";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(AssociationClassNameEditPart.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_3002) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(AssociationClassAttributeCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Operation_3003) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(AssociationClassOperationCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Class_3004) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(AssociationClassNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassLinkEditPart.java
deleted file mode 100644
index 678e8b6b245..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassLinkEditPart.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractAssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.AssociationFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomAssociationClassLinkItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassLinkItemSemanticEditPolicy;

-

-/**

- * @generated

- */

-public class AssociationClassLinkEditPart extends AbstractAssociationEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4017;

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassLinkEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AssociationClassLinkItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomAssociationClassLinkItemSemanticEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AssociationClassRoleSourceEditPart) {

-			((AssociationClassRoleSourceEditPart) childEditPart).setLabel(

-					getPrimaryShape().getRoleSourceLabel());

-			return true;

-		}

-		if (childEditPart instanceof AssociationClassRoleTargetEditPart) {

-			((AssociationClassRoleTargetEditPart) childEditPart).setLabel(

-					getPrimaryShape().getRoleTargetLabel());

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

-			return true;

-		}

-		if (childEditPart instanceof AssociationClassRoleTargetEditPart) {

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

-	}

-

-	/**

-	 * @generated

-	 */

-	public AssociationFigure getPrimaryShape() {

-		return (AssociationFigure) getFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNameEditPart.java
deleted file mode 100644
index 7e9019d4939..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNameEditPart.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 AssociationClassNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 5066;

-

-	/**

-	 * @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 AssociationClassNameEditPart(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 (NameLabelIconHelper.showLabelIcon(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.AssociationClass_2013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassNameEditPart.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNestedClassifierCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNestedClassifierCompartmentEditPart.java
deleted file mode 100644
index 4500d0b6340..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNestedClassifierCompartmentEditPart.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassNestedClassifierCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class AssociationClassNestedClassifierCompartmentEditPart

-		extends ListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7037;

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassNestedClassifierCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.AssociationClassNestedClassifierCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AssociationClassNestedClassifierCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassNestedClassifierCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new NestedClazzCompartmentCreationEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Class_3004) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassOperationCompartmentEditPart.java
deleted file mode 100644
index 6cb1fad2fe8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassOperationCompartmentEditPart.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassOperationCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class AssociationClassOperationCompartmentEditPart

-		extends ListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7036;

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassOperationCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.AssociationClassOperationCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AssociationClassOperationCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassOperationCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Operation_3003) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleSourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleSourceEditPart.java
deleted file mode 100644
index afbcb6d2cf4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleSourceEditPart.java
+++ /dev/null
@@ -1,782 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndTargetEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 AssociationClassRoleSourceEditPart 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.clazz.edit.parts.AssociationClassRoleSourceEditPart.VISUAL_ID), new Point(0, -20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassRoleSourceEditPart(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(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new DisplayAssociationEndTargetEditPolicy());

-	}

-

-	/**

-	 * @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.AssociationClass_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassRoleSourceEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleTargetEditPart.java
deleted file mode 100644
index 4964839f53f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleTargetEditPart.java
+++ /dev/null
@@ -1,782 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndSourceEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 AssociationClassRoleTargetEditPart 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.clazz.edit.parts.AssociationClassRoleTargetEditPart.VISUAL_ID), new Point(0, 20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassRoleTargetEditPart(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(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new DisplayAssociationEndSourceEditPolicy());

-	}

-

-	/**

-	 * @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.AssociationClass_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassRoleTargetEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationEditPart.java
deleted file mode 100644
index dfeac2daab4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationEditPart.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractAssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.AssociationFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomAssociationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-

-/**

- * @generated

- */

-public class AssociationEditPart extends AbstractAssociationEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4001;

-

-	/**

-	 * @generated

-	 */

-	public AssociationEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AssociationItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomAssociationItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AppliedStereotypeAssociationEditPart) {

-			((AppliedStereotypeAssociationEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeAssociationLabel());

-			return true;

-		}

-		if (childEditPart instanceof AssociationNameEditPart) {

-			((AssociationNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAssociationNameLabel());

-			return true;

-		}

-		if (childEditPart instanceof AssociationTargetNameEditPart) {

-			((AssociationTargetNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getRoleTargetLabel());

-			return true;

-		}

-		if (childEditPart instanceof AssociationSourceNameEditPart) {

-			((AssociationSourceNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getRoleSourceLabel());

-			return true;

-		}

-		if (childEditPart instanceof AssociationMultiplicitySourceEditPart) {

-			((AssociationMultiplicitySourceEditPart) childEditPart).setLabel(

-					getPrimaryShape().getMultiplicitySourceLabel());

-			return true;

-		}

-		if (childEditPart instanceof AssociationMultiplicityTargetEditPart) {

-			((AssociationMultiplicityTargetEditPart) 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 AppliedStereotypeAssociationEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof AssociationNameEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof AssociationTargetNameEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof AssociationSourceNameEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof AssociationMultiplicitySourceEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof AssociationMultiplicityTargetEditPart) {

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

-	}

-

-	/**

-	 * @generated

-	 */

-	public AssociationFigure getPrimaryShape() {

-		return (AssociationFigure) getFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicitySourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicitySourceEditPart.java
deleted file mode 100644
index fa09b975ae6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicitySourceEditPart.java
+++ /dev/null
@@ -1,782 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndSourceMultiplicityEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart

-{

-

-	/**

-	 * @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.clazz.edit.parts.AssociationMultiplicitySourceEditPart.VISUAL_ID), new Point(0, 20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AssociationMultiplicitySourceEditPart(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(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new DisplayAssociationEndSourceMultiplicityEditPolicy());

-	}

-

-	/**

-	 * @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.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicitySourceEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicityTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicityTargetEditPart.java
deleted file mode 100644
index d20ae941791..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicityTargetEditPart.java
+++ /dev/null
@@ -1,782 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndTargetMultiplicityEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart

-{

-

-	/**

-	 * @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.clazz.edit.parts.AssociationMultiplicityTargetEditPart.VISUAL_ID), new Point(0, -20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AssociationMultiplicityTargetEditPart(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(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new DisplayAssociationEndTargetMultiplicityEditPolicy());

-	}

-

-	/**

-	 * @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.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicityTargetEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNameEditPart.java
deleted file mode 100644
index 38144cc5855..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNameEditPart.java
+++ /dev/null
@@ -1,805 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 AssociationNameEditPart 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.clazz.edit.parts.AssociationNameEditPart.VISUAL_ID), new Point(0, 20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AssociationNameEditPart(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 (NameLabelIconHelper.showLabelIcon(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.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNameEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java
deleted file mode 100644
index 04f35fe038a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomAssociationNodeItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationNodeItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.DiamondNode;

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class AssociationNodeEditPart extends NodeEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2015;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public AssociationNodeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AssociationNodeItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomAssociationNodeItemSemanticEditPolicy());

-		// 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 DiamondNode();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.DiamondNode

-	 * @generated

-	 */

-	public DiamondNode getPrimaryShape() {

-		return (DiamondNode) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "AssociationNode";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationSourceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationSourceNameEditPart.java
deleted file mode 100644
index bb6a49e6bdc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationSourceNameEditPart.java
+++ /dev/null
@@ -1,782 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndSourceEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 AssociationSourceNameEditPart 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.clazz.edit.parts.AssociationSourceNameEditPart.VISUAL_ID), new Point(0, 20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AssociationSourceNameEditPart(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(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new DisplayAssociationEndSourceEditPolicy());

-	}

-

-	/**

-	 * @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.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationSourceNameEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationTargetNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationTargetNameEditPart.java
deleted file mode 100644
index 5d89a744b08..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationTargetNameEditPart.java
+++ /dev/null
@@ -1,782 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndTargetEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 AssociationTargetNameEditPart 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.clazz.edit.parts.AssociationTargetNameEditPart.VISUAL_ID), new Point(0, -20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AssociationTargetNameEditPart(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(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new DisplayAssociationEndTargetEditPolicy());

-	}

-

-	/**

-	 * @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.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationTargetNameEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/BindingSubstitutionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/BindingSubstitutionEditPart.java
deleted file mode 100644
index 203a9734712..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/BindingSubstitutionEditPart.java
+++ /dev/null
@@ -1,790 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.custom.policies.TemplateBindingDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 BindingSubstitutionEditPart 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.clazz.edit.parts.BindingSubstitutionEditPart.VISUAL_ID), new Point(0, 40));

-	}

-

-	/**

-	 * @generated

-	 */

-	public BindingSubstitutionEditPart(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(TemplateBindingDisplayEditPolicy.TEMPLATE_PARAMETER_DISPLAY, new TemplateBindingDisplayEditPolicy());

-	}

-

-	/**

-	 * @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.TemplateBinding_4015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.BindingSubstitutionEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPart.java
deleted file mode 100644
index 5bd7a58240a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPart.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassAttributeCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class ClassAttributeCompartmentEditPart

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7017;

-

-	/**

-	 * @generated

-	 */

-	public ClassAttributeCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.ClassAttributeCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassAttributeCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassAttributeCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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_3012) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPartCN.java
deleted file mode 100644
index 0c0d4c40bde..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPartCN.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassAttributeCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class ClassAttributeCompartmentEditPartCN

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7011;

-

-	/**

-	 * @generated

-	 */

-	public ClassAttributeCompartmentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.ClassAttributeCompartmentEditPartCN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassAttributeCompartmentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassAttributeCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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_3012) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java
deleted file mode 100644
index 770ce50506c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.StackLayout;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EAttribute;

-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.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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.locator.ContainmentPositionLocator;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomViewComponentEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class ClassEditPart extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2008;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public ClassEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassCanonicalEditPolicy());

-

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomClassItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new CustomViewComponentEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		// 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 RedefinableTemplateSignatureEditPart.VISUAL_ID:

-				case ContainmentCircleEditPart.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);

-		//set the figure active when the feature of the of a class is true

-		if (resolveSemanticElement() != null) {

-			if (resolveSemanticElement().equals(event.getNotifier()) && (event.getFeature() instanceof EAttribute) && ((EAttribute) (event.getFeature())).getName().equals("isActive")) {

-				((ClassifierFigure) getPrimaryShape()).setActive(event.getNewBooleanValue());

-				refreshVisuals();

-			}

-		}

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected IFigure createNodeShape() {

-		return primaryShape = new ClassifierFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure

-	 * @generated

-	 */

-	public ClassifierFigure getPrimaryShape() {

-		return (ClassifierFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ClassNameEditPart) {

-			((ClassNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

-			return true;

-		}

-

-		if (childEditPart instanceof ClassAttributeCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((ClassAttributeCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof ClassOperationCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((ClassOperationCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof ClassNestedClassifierCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getNestedClassifierFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((ClassNestedClassifierCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		//Papyrus Gencode :Affixed Containment locator

-		if (childEditPart instanceof ContainmentCircleEditPart) {

-			IBorderItemLocator locator = new ContainmentPositionLocator(getMainFigure(), PositionConstants.NORTH);

-			getBorderedFigure().getBorderItemContainer().add(((ContainmentCircleEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ClassNameEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof ClassAttributeCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			pane.remove(((ClassAttributeCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof ClassOperationCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			pane.remove(((ClassOperationCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof ClassNestedClassifierCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getNestedClassifierFigure();

-			pane.remove(((ClassNestedClassifierCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof ContainmentCircleEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((ContainmentCircleEditPart) 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 ClassAttributeCompartmentEditPart) {

-			return getPrimaryShape().getAttributeCompartmentFigure();

-		}

-		if (editPart instanceof ClassOperationCompartmentEditPart) {

-			return getPrimaryShape().getOperationCompartmentFigure();

-		}

-		if (editPart instanceof ClassNestedClassifierCompartmentEditPart) {

-			return getPrimaryShape().getNestedClassifierFigure();

-		}

-		if (editPart instanceof IBorderItemEditPart) {

-			return getBorderedFigure().getBorderItemContainer();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "Class";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNameEditPart.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_3012) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Reception_3011) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Operation_3013) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Class_3014) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Interface_3036) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Enumeration_3052) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.PrimitiveType_3047) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.DataType_3044) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Signal_3050) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java
deleted file mode 100644
index 6169879a705..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.StackLayout;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EAttribute;

-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.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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomClassItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class ClassEditPartCN extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3010;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public ClassEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassCanonicalEditPolicyCN());

-

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomClassItemSemanticEditPolicyCN());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		// 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 RedefinableTemplateSignatureEditPart.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);

-		//set the figure active when the feature of the of a class is true

-		if (resolveSemanticElement() != null) {

-			if (resolveSemanticElement().equals(event.getNotifier()) && (event.getFeature() instanceof EAttribute) && ((EAttribute) (event.getFeature())).getName().equals("isActive")) {

-				((ClassifierFigure) getPrimaryShape()).setActive(event.getNewBooleanValue());

-				refreshVisuals();

-			}

-		}

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected IFigure createNodeShape() {

-		return primaryShape = new ClassifierFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure

-	 * @generated

-	 */

-	public ClassifierFigure getPrimaryShape() {

-		return (ClassifierFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ClassNameEditPartCN) {

-			((ClassNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

-			return true;

-		}

-

-		if (childEditPart instanceof ClassAttributeCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((ClassAttributeCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof ClassOperationCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((ClassOperationCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof ClassNestedClassifierCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getNestedClassifierFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((ClassNestedClassifierCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ClassNameEditPartCN) {

-			return true;

-		}

-		if (childEditPart instanceof ClassAttributeCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			pane.remove(((ClassAttributeCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof ClassOperationCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			pane.remove(((ClassOperationCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof ClassNestedClassifierCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getNestedClassifierFigure();

-			pane.remove(((ClassNestedClassifierCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) 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 ClassAttributeCompartmentEditPartCN) {

-			return getPrimaryShape().getAttributeCompartmentFigure();

-		}

-		if (editPart instanceof ClassOperationCompartmentEditPartCN) {

-			return getPrimaryShape().getOperationCompartmentFigure();

-		}

-		if (editPart instanceof ClassNestedClassifierCompartmentEditPartCN) {

-			return getPrimaryShape().getNestedClassifierFigure();

-		}

-		if (editPart instanceof IBorderItemEditPart) {

-			return getBorderedFigure().getBorderItemContainer();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "Class";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNameEditPartCN.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_3012) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Reception_3011) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Operation_3013) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Class_3014) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Interface_3036) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Enumeration_3052) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.PrimitiveType_3047) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.DataType_3044) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Signal_3050) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPart.java
deleted file mode 100644
index 058d6076b84..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPart.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 ClassNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 5029;

-

-	/**

-	 * @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 ClassNameEditPart(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 (NameLabelIconHelper.showLabelIcon(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_2008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPartCN.java
deleted file mode 100644
index d8764a082f2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPartCN.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 ClassNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 5014;

-

-	/**

-	 * @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 ClassNameEditPartCN(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 (NameLabelIconHelper.showLabelIcon(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_3010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPartCN.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPart.java
deleted file mode 100644
index f08b3b2be8d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPart.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class ClassNestedClassifierCompartmentEditPart

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7019;

-

-	/**

-	 * @generated

-	 */

-	public ClassNestedClassifierCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.ClassNestedClassifierCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassNestedClassifierCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new NestedClazzCompartmentCreationEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Class_3014) {

-				return this;

-			}

-			if (type == UMLElementTypes.Interface_3036) {

-				return this;

-			}

-			if (type == UMLElementTypes.Enumeration_3052) {

-				return this;

-			}

-			if (type == UMLElementTypes.PrimitiveType_3047) {

-				return this;

-			}

-			if (type == UMLElementTypes.DataType_3044) {

-				return this;

-			}

-			if (type == UMLElementTypes.Signal_3050) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPartCN.java
deleted file mode 100644
index b4524fc1d67..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPartCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class ClassNestedClassifierCompartmentEditPartCN

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7013;

-

-	/**

-	 * @generated

-	 */

-	public ClassNestedClassifierCompartmentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.ClassNestedClassifierCompartmentEditPartCN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassNestedClassifierCompartmentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new NestedClazzCompartmentCreationEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Class_3014) {

-				return this;

-			}

-			if (type == UMLElementTypes.Interface_3036) {

-				return this;

-			}

-			if (type == UMLElementTypes.Enumeration_3052) {

-				return this;

-			}

-			if (type == UMLElementTypes.PrimitiveType_3047) {

-				return this;

-			}

-			if (type == UMLElementTypes.DataType_3044) {

-				return this;

-			}

-			if (type == UMLElementTypes.Signal_3050) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPart.java
deleted file mode 100644
index 2584a3866d9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPart.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassOperationCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class ClassOperationCompartmentEditPart

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7018;

-

-	/**

-	 * @generated

-	 */

-	public ClassOperationCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.ClassOperationCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassOperationCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassOperationCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Reception_3011) {

-				return this;

-			}

-			if (type == UMLElementTypes.Operation_3013) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPartCN.java
deleted file mode 100644
index 2d6a354b0ba..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPartCN.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassOperationCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class ClassOperationCompartmentEditPartCN

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7012;

-

-	/**

-	 * @generated

-	 */

-	public ClassOperationCompartmentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.ClassOperationCompartmentEditPartCN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassOperationCompartmentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassOperationCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Reception_3011) {

-				return this;

-			}

-			if (type == UMLElementTypes.Operation_3013) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassifierTemplateParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassifierTemplateParameterEditPart.java
deleted file mode 100644
index b4392ba3f63..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassifierTemplateParameterEditPart.java
+++ /dev/null
@@ -1,823 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractTemplateParameterEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateParameterFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassifierTemplateParameterItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 ClassifierTemplateParameterEditPart extends

-		AbstractTemplateParameterEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3031;

-

-	/**

-	 * @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 ClassifierTemplateParameterEditPart(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 ClassifierTemplateParameterItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(TemplateParamaterDisplayEditPolicy.TEMPLATE_PARAMETER_DISPLAY, new TemplateParamaterDisplayEditPolicy());

-	}

-

-	/**

-	 * @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.ClassifierTemplateParameter_3031, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassifierTemplateParameterEditPart.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 (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 TemplateParameterFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentAnnotatedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentAnnotatedElementEditPart.java
deleted file mode 100644
index 2c31773ede6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentAnnotatedElementEditPart.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.CommentAnnotatedElementItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

-

-/**

- * @generated

- */

-public class CommentAnnotatedElementEditPart extends ConnectionEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4013;

-

-	/**

-	 * @generated

-	 */

-	public CommentAnnotatedElementEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CommentAnnotatedElementItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-	}

-

-	/**

-	 * 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPart.java
deleted file mode 100644
index d793580afe0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPart.java
+++ /dev/null
@@ -1,827 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 5038;

-

-	/**

-	 * @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_2012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPartCN.java
deleted file mode 100644
index dd36a8f658b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPartCN.java
+++ /dev/null
@@ -1,827 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 5063;

-

-	/**

-	 * @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_3028, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPart.java
deleted file mode 100644
index cc09f676772..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPart.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.CommentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-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.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class CommentEditPart extends AbstractCommentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2012;

-

-	/**

-	 * @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(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

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

-		String prefElementId = "Comment";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPartCN.java
deleted file mode 100644
index 5a0a7821d89..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPartCN.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.CommentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-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.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class CommentEditPartCN extends AbstractCommentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3028;

-

-	/**

-	 * @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(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

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

-		String prefElementId = "Comment";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPart.java
deleted file mode 100644
index 3efaca777ae..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPart.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentAttributeCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class ComponentAttributeCompartmentEditPart

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7002;

-

-	/**

-	 * @generated

-	 */

-	public ComponentAttributeCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.ComponentAttributeCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentAttributeCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentAttributeCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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_3002) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPartCN.java
deleted file mode 100644
index f019616633b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPartCN.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentAttributeCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class ComponentAttributeCompartmentEditPartCN

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7023;

-

-	/**

-	 * @generated

-	 */

-	public ComponentAttributeCompartmentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.ComponentAttributeCompartmentEditPartCN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentAttributeCompartmentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentAttributeCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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_3002) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java
deleted file mode 100644
index 9d4ae3cc066..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-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.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.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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class ComponentEditPart extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2002;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public ComponentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentCanonicalEditPolicy());

-

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomComponentItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		// 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 RedefinableTemplateSignatureEditPart.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 ComponentFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ComponentFigure

-	 * @generated

-	 */

-	public ComponentFigure getPrimaryShape() {

-		return (ComponentFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ComponentNameEditPart) {

-			((ComponentNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

-			return true;

-		}

-

-		if (childEditPart instanceof ComponentAttributeCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((ComponentAttributeCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof ComponentOperationCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((ComponentOperationCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof ComponentNestedClassifierCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getNestedClassifierFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((ComponentNestedClassifierCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ComponentNameEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof ComponentAttributeCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			pane.remove(((ComponentAttributeCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof ComponentOperationCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			pane.remove(((ComponentOperationCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof ComponentNestedClassifierCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getNestedClassifierFigure();

-			pane.remove(((ComponentNestedClassifierCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) 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 ComponentAttributeCompartmentEditPart) {

-			return getPrimaryShape().getAttributeCompartmentFigure();

-		}

-		if (editPart instanceof ComponentOperationCompartmentEditPart) {

-			return getPrimaryShape().getOperationCompartmentFigure();

-		}

-		if (editPart instanceof ComponentNestedClassifierCompartmentEditPart) {

-			return getPrimaryShape().getNestedClassifierFigure();

-		}

-		if (editPart instanceof IBorderItemEditPart) {

-			return getBorderedFigure().getBorderItemContainer();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "Component";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNameEditPart.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_3002) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentAttributeCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Operation_3003) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Reception_3011) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Class_3004) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Interface_3037) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Enumeration_3053) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.PrimitiveType_3046) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.DataType_3045) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Signal_3051) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java
deleted file mode 100644
index 2416cecc6d2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-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.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.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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomComponentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class ComponentEditPartCN extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3021;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public ComponentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentCanonicalEditPolicyCN());

-

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomComponentItemSemanticEditPolicyCN());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		// 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 RedefinableTemplateSignatureEditPart.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 ComponentFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ComponentFigure

-	 * @generated

-	 */

-	public ComponentFigure getPrimaryShape() {

-		return (ComponentFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ComponentNameEditPartCN) {

-			((ComponentNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

-			return true;

-		}

-

-		if (childEditPart instanceof ComponentAttributeCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((ComponentAttributeCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof ComponentOperationCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((ComponentOperationCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof ComponentNestedClassifierCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getNestedClassifierFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((ComponentNestedClassifierCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ComponentNameEditPartCN) {

-			return true;

-		}

-		if (childEditPart instanceof ComponentAttributeCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			pane.remove(((ComponentAttributeCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof ComponentOperationCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			pane.remove(((ComponentOperationCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof ComponentNestedClassifierCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getNestedClassifierFigure();

-			pane.remove(((ComponentNestedClassifierCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) 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 ComponentAttributeCompartmentEditPartCN) {

-			return getPrimaryShape().getAttributeCompartmentFigure();

-		}

-		if (editPart instanceof ComponentOperationCompartmentEditPartCN) {

-			return getPrimaryShape().getOperationCompartmentFigure();

-		}

-		if (editPart instanceof ComponentNestedClassifierCompartmentEditPartCN) {

-			return getPrimaryShape().getNestedClassifierFigure();

-		}

-		if (editPart instanceof IBorderItemEditPart) {

-			return getBorderedFigure().getBorderItemContainer();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "Component";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNameEditPartCN.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_3002) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentAttributeCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Operation_3003) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Reception_3011) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Class_3004) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Interface_3037) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Enumeration_3053) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.PrimitiveType_3046) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.DataType_3045) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Signal_3051) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPart.java
deleted file mode 100644
index 1f0437dd605..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPart.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 ComponentNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 5005;

-

-	/**

-	 * @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 ComponentNameEditPart(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 (NameLabelIconHelper.showLabelIcon(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_2002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNameEditPart.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPartCN.java
deleted file mode 100644
index 8fef55b76ca..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPartCN.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 ComponentNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 5043;

-

-	/**

-	 * @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 ComponentNameEditPartCN(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 (NameLabelIconHelper.showLabelIcon(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_3021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNameEditPartCN.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPart.java
deleted file mode 100644
index 645d10c3872..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPart.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class ComponentNestedClassifierCompartmentEditPart

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7004;

-

-	/**

-	 * @generated

-	 */

-	public ComponentNestedClassifierCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.ComponentNestedClassifierCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentNestedClassifierCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new NestedClazzCompartmentCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Class_3004) {

-				return this;

-			}

-			if (type == UMLElementTypes.Interface_3037) {

-				return this;

-			}

-			if (type == UMLElementTypes.Enumeration_3053) {

-				return this;

-			}

-			if (type == UMLElementTypes.PrimitiveType_3046) {

-				return this;

-			}

-			if (type == UMLElementTypes.DataType_3045) {

-				return this;

-			}

-			if (type == UMLElementTypes.Signal_3051) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPartCN.java
deleted file mode 100644
index c48ca8ca73d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPartCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class ComponentNestedClassifierCompartmentEditPartCN

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7025;

-

-	/**

-	 * @generated

-	 */

-	public ComponentNestedClassifierCompartmentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.ComponentNestedClassifierCompartmentEditPartCN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentNestedClassifierCompartmentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new NestedClazzCompartmentCreationEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Class_3004) {

-				return this;

-			}

-			if (type == UMLElementTypes.Interface_3037) {

-				return this;

-			}

-			if (type == UMLElementTypes.Enumeration_3053) {

-				return this;

-			}

-			if (type == UMLElementTypes.PrimitiveType_3046) {

-				return this;

-			}

-			if (type == UMLElementTypes.DataType_3045) {

-				return this;

-			}

-			if (type == UMLElementTypes.Signal_3051) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPart.java
deleted file mode 100644
index f2651e43ab6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPart.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentOperationCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class ComponentOperationCompartmentEditPart

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7003;

-

-	/**

-	 * @generated

-	 */

-	public ComponentOperationCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.ComponentOperationCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentOperationCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentOperationCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Operation_3003) {

-				return this;

-			}

-			if (type == UMLElementTypes.Reception_3011) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPartCN.java
deleted file mode 100644
index 9a96237a27d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPartCN.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentOperationCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class ComponentOperationCompartmentEditPartCN

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7024;

-

-	/**

-	 * @generated

-	 */

-	public ComponentOperationCompartmentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.ComponentOperationCompartmentEditPartCN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentOperationCompartmentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentOperationCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Operation_3003) {

-				return this;

-			}

-			if (type == UMLElementTypes.Reception_3011) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectableElementTemplateParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectableElementTemplateParameterEditPart.java
deleted file mode 100644
index 8932c76c12c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectableElementTemplateParameterEditPart.java
+++ /dev/null
@@ -1,822 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateParameterFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ConnectableElementTemplateParameterItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 ConnectableElementTemplateParameterEditPart extends CompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3034;

-

-	/**

-	 * @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 ConnectableElementTemplateParameterEditPart(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 ConnectableElementTemplateParameterItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(TemplateParamaterDisplayEditPolicy.TEMPLATE_PARAMETER_DISPLAY, new TemplateParamaterDisplayEditPolicy());

-	}

-

-	/**

-	 * @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.ConnectableElementTemplateParameter_3034, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectableElementTemplateParameterEditPart.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 (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 TemplateParameterFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorDurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorDurationObservationEditPart.java
deleted file mode 100644
index 9a719f46d16..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorDurationObservationEditPart.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.ConnectorDurationObservationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

-

-/**

- * @generated

- */

-public class ConnectorDurationObservationEditPart extends ConnectionEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4025;

-

-	/**

-	 * @generated

-	 */

-	public ConnectorDurationObservationEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConnectorDurationObservationItemSemanticEditPolicy());

-	}

-

-	/**

-	 * 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorTimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorTimeObservationEditPart.java
deleted file mode 100644
index 6576a35de1b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorTimeObservationEditPart.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.ConnectorTimeObservationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

-

-/**

- * @generated

- */

-public class ConnectorTimeObservationEditPart extends ConnectionEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4024;

-

-	/**

-	 * @generated

-	 */

-	public ConnectorTimeObservationEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConnectorTimeObservationItemSemanticEditPolicy());

-	}

-

-	/**

-	 * 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPart.java
deleted file mode 100644
index 2b04414f7b1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPart.java
+++ /dev/null
@@ -1,827 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 ConstraintBodyEditPart 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 ConstraintBodyEditPart(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_2011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintBodyEditPart.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPartCN.java
deleted file mode 100644
index 06e42acdb0d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPartCN.java
+++ /dev/null
@@ -1,827 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 ConstraintBodyEditPartCN 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 ConstraintBodyEditPartCN(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_3029, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintBodyEditPartCN.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintConstrainedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintConstrainedElementEditPart.java
deleted file mode 100644
index 5e9a9789ab8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintConstrainedElementEditPart.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ConstraintConstrainedElementItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

-

-/**

- * @generated

- */

-public class ConstraintConstrainedElementEditPart extends ConnectionEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4014;

-

-	/**

-	 * @generated

-	 */

-	public ConstraintConstrainedElementEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConstraintConstrainedElementItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-	}

-

-	/**

-	 * 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPart.java
deleted file mode 100644
index ea619f22b6c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPart.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomConstraintItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ConstraintItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-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.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class ConstraintEditPart extends AbstractConstraintEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2011;

-

-	/**

-	 * @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(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomConstraintItemSemanticEditPolicy());

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

-			((ConstraintBodyEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ConstraintNameEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof ConstraintBodyEditPart) {

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

-		String prefElementId = "Constraint";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPartCN.java
deleted file mode 100644
index 51a57b0aa72..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPartCN.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomConstraint2ItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ConstraintItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-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.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class ConstraintEditPartCN extends AbstractConstraintEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3029;

-

-	/**

-	 * @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(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomConstraint2ItemSemanticEditPolicy());

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

-			((ConstraintBodyEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ConstraintNameEditPartCN) {

-			return true;

-		}

-		if (childEditPart instanceof ConstraintBodyEditPartCN) {

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

-		String prefElementId = "Constraint";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintLabelEditPart.java
deleted file mode 100644
index 310fcc1ed7a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintLabelEditPart.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 ConstraintLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 5067;

-

-	/**

-	 * @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.clazz.edit.parts.ConstraintLabelEditPart.VISUAL_ID), new Point(0, 20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public ConstraintLabelEditPart(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.GeneralizationSet_4020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintLabelEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPart.java
deleted file mode 100644
index af9078ad6b7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPart.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 5037;

-

-	/**

-	 * @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 (NameLabelIconHelper.showLabelIcon(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_2011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPartCN.java
deleted file mode 100644
index 81c5a91136f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPartCN.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 5064;

-

-	/**

-	 * @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 (NameLabelIconHelper.showLabelIcon(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_3029, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentCircleEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentCircleEditPart.java
deleted file mode 100644
index b926b418821..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentCircleEditPart.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

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

-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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.ContainmentFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomContainmentCircleItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class ContainmentCircleEditPart extends AbstractBorderItemEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3032;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public ContainmentCircleEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, getPrimaryDragEditPolicy());

-		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomContainmentCircleItemSemanticEditPolicy());

-		// 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 ContainmentFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.clazz.custom.figure.ContainmentFigure

-	 * @generated

-	 */

-	public ContainmentFigure getPrimaryShape() {

-		return (ContainmentFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "ContainmentCircle";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentLinkEditPart.java
deleted file mode 100644
index 3d18c719d71..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentLinkEditPart.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.custom.figure.AddedLinkFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomViewComponentEditPolicy;

-

-/**

- * @generated

- */

-public class ContainmentLinkEditPart extends ConnectionEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4023;

-

-	/**

-	 * @generated

-	 */

-	public ContainmentLinkEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy());

-		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new CustomViewComponentEditPolicy());

-	}

-

-	/**

-	 * 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 AddedLinkFigure();

-	}

-

-	/**

-	 * @generated

-	 */

-	public AddedLinkFigure getPrimaryShape() {

-		return (AddedLinkFigure) getFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentSubLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentSubLinkEditPart.java
deleted file mode 100644
index 1ae678d0db2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentSubLinkEditPart.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.custom.figure.AddedLinkFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomViewComponentEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomContainmentSubLinkItemSemanticEditPolicy;

-

-/**

- * @generated

- */

-public class ContainmentSubLinkEditPart extends ConnectionEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4022;

-

-	/**

-	 * @generated

-	 */

-	public ContainmentSubLinkEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy());

-		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new CustomViewComponentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomContainmentSubLinkItemSemanticEditPolicy());

-	}

-

-	/**

-	 * 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 AddedLinkFigure();

-	}

-

-	/**

-	 * @generated

-	 */

-	public AddedLinkFigure getPrimaryShape() {

-		return (AddedLinkFigure) getFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkAppliedStereotypeEditPart.java
deleted file mode 100644
index a96fe0d0013..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkAppliedStereotypeEditPart.java
+++ /dev/null
@@ -1,782 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.infra.gmfdiag.common.editpolicies.NoSemanticParserEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 8501;

-

-	/**

-	 * @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.clazz.edit.parts.ContextLinkAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 15));

-	}

-

-	/**

-	 * @generated

-	 */

-	public ContextLinkAppliedStereotypeEditPart(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(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NoSemanticParserEditPolicy());

-	}

-

-	/**

-	 * @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.ConstraintContext_8500, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkAppliedStereotypeEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkEditPart.java
deleted file mode 100644
index b2d59df17c6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkEditPart.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.CustomContextLinkFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ContextLinkItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-

-/**

- * @generated

- */

-public class ContextLinkEditPart extends ConnectionEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 8500;

-

-	/**

-	 * @generated

-	 */

-	public ContextLinkEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ContextLinkItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ContextLinkAppliedStereotypeEditPart) {

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

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

-	}

-

-	/**

-	 * @generated

-	 */

-	public CustomContextLinkFigure getPrimaryShape() {

-		return (CustomContextLinkFigure) getFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPart.java
deleted file mode 100644
index f2548621dc0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPart.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class DataTypeAttributeCompartmentEditPart

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7020;

-

-	/**

-	 * @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());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeAttributeCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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_3018) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
deleted file mode 100644
index 80334cc2a54..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class DataTypeAttributeCompartmentEditPartCN

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7032;

-

-	/**

-	 * @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());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeAttributeCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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_3018) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java
deleted file mode 100644
index 82bddcfd92a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-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.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.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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

-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.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class DataTypeEditPart extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2010;

-

-	/**

-	 * @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(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeCanonicalEditPolicy());

-

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDataTypeItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		// 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 RedefinableTemplateSignatureEditPart.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 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;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);

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

-		}

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) 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();

-		}

-		if (editPart instanceof IBorderItemEditPart) {

-			return getBorderedFigure().getBorderItemContainer();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "DataType";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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_3018) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Operation_3019) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java
deleted file mode 100644
index 8592ed51f7b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-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.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.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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

-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.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class DataTypeEditPartCN extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3027;

-

-	/**

-	 * @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(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeCanonicalEditPolicyCN());

-

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDataTypeItemSemanticEditPolicyCN());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		// 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 RedefinableTemplateSignatureEditPart.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 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;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);

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

-		}

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) 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();

-		}

-		if (editPart instanceof IBorderItemEditPart) {

-			return getBorderedFigure().getBorderItemContainer();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "DataType";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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_3018) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Operation_3019) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPart.java
deleted file mode 100644
index f76428af60f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPart.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 5035;

-

-	/**

-	 * @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 (NameLabelIconHelper.showLabelIcon(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_2010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPartCN.java
deleted file mode 100644
index 85945d2e16e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPartCN.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 5061;

-

-	/**

-	 * @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 (NameLabelIconHelper.showLabelIcon(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_3027, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPart.java
deleted file mode 100644
index 3b11a1a69f2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPart.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class DataTypeOperationCompartmentEditPart

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7021;

-

-	/**

-	 * @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());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeOperationCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Operation_3019) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPartCN.java
deleted file mode 100644
index a203d681fee..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPartCN.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class DataTypeOperationCompartmentEditPartCN

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7033;

-

-	/**

-	 * @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());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeOperationCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Operation_3019) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java
deleted file mode 100644
index 507a9615425..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomDefaultNamedElementItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DefaultNamedElementItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

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

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class DefaultNamedElementEditPart extends NamedElementEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2097;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public DefaultNamedElementEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultNamedElementItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultNamedElementItemSemanticEditPolicy());

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

-			((DefaultNamedElementNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DefaultNamedElementNameEditPart) {

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

-		String prefElementId = "DefaultNamedElement";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DefaultNamedElementNameEditPart.VISUAL_ID));

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementNameEditPart.java
deleted file mode 100644
index d330b99e8de..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementNameEditPart.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 5157;

-

-	/**

-	 * @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 DefaultNamedElementNameEditPart(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 (NameLabelIconHelper.showLabelIcon(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.NamedElement_2097, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementNameEditPart.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyBranchEditPart.java
deleted file mode 100644
index e26bf33bb3e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyBranchEditPart.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DependencyBranchSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

-

-/**

- * @generated

- */

-public class DependencyBranchEditPart extends ConnectionEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4018;

-

-	/**

-	 * @generated

-	 */

-	public DependencyBranchEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DependencyBranchSemanticEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-	}

-

-	/**

-	 * 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyEditPart.java
deleted file mode 100644
index 490f9ceb12e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyEditPart.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DependencyItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

-

-/**

- * @generated

- */

-public class DependencyEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4008;

-

-	/**

-	 * @generated

-	 */

-	public DependencyEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DependencyItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DependencyNameEditPart) {

-			((DependencyNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

-			return true;

-		}

-		if (childEditPart instanceof AppliedStereotypeDependencyEditPart) {

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

-			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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNameEditPart.java
deleted file mode 100644
index 5832edcf1db..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNameEditPart.java
+++ /dev/null
@@ -1,788 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 6026;

-

-	/**

-	 * @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.clazz.edit.parts.DependencyNameEditPart.VISUAL_ID), new Point(0, 40));

-	}

-

-	/**

-	 * @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_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java
deleted file mode 100644
index 0f5d7b3aa20..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.StackLayout;

-import org.eclipse.draw2d.geometry.Dimension;

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

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

-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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DependencyNodeItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.DependencyNodeFigure;

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2014;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public DependencyNodeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DependencyNodeItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

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

-	}

-

-	/**

-	 * @generated

-	 */

-	protected IFigure createNodeShape() {

-		return primaryShape = new DependencyNodeFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.DependencyNodeFigure

-	 * @generated

-	 */

-	public DependencyNodeFigure getPrimaryShape() {

-		return (DependencyNodeFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof MultiDependencyLabelEditPart) {

-			BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH);

-			locator.setBorderItemOffset(new Dimension(-20, -20));

-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

-			super.addBorderItem(borderItemContainer, borderItemEditPart);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "DependencyNode";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(MultiDependencyLabelEditPart.VISUAL_ID));

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DiagramNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DiagramNameEditPart.java
deleted file mode 100644
index 75fd3076d54..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DiagramNameEditPart.java
+++ /dev/null
@@ -1,813 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortcutDiagramNameEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 DiagramNameEditPart extends

-		AbstractShortcutDiagramNameEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 0;

-

-	/**

-	 * @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.clazz.edit.parts.DiagramNameEditPart.VISUAL_ID), new Point(0, 0));

-	}

-

-	/**

-	 * @generated

-	 */

-	public DiagramNameEditPart(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.Diagram_2016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DiagramNameEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java
deleted file mode 100644
index 734e5b5a078..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.DurationObservationNodeFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ObservationLayoutEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomDurationObservationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DurationObservationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-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.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class DurationObservationEditPart extends AbstractObservationEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2095;

-

-	/**

-	 * @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(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ObservationLayoutEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDurationObservationItemSemanticEditPolicy());

-		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.clazz.custom.figure.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() {

-		String prefElementId = "DurationObservation";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationNameEditPart.java
deleted file mode 100644
index d4645b865d9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationNameEditPart.java
+++ /dev/null
@@ -1,812 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 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

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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_2095, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationStereotypeLabelEditPart.java
deleted file mode 100644
index 68f5090a84e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationStereotypeLabelEditPart.java
+++ /dev/null
@@ -1,817 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 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

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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_2095, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportAliasEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportAliasEditPart.java
deleted file mode 100644
index e8da1e6de22..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportAliasEditPart.java
+++ /dev/null
@@ -1,788 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 ElementImportAliasEditPart 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.clazz.edit.parts.ElementImportAliasEditPart.VISUAL_ID), new Point(0, 40));

-	}

-

-	/**

-	 * @generated

-	 */

-	public ElementImportAliasEditPart(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.ElementImport_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportAliasEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportEditPart.java
deleted file mode 100644
index dbca0b2f5e1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportEditPart.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeElementImportLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ElementImportItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

-

-/**

- * @generated

- */

-public class ElementImportEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4009;

-

-	/**

-	 * @generated

-	 */

-	public ElementImportEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ElementImportItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeElementImportLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ElementImportAliasEditPart) {

-			((ElementImportAliasEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

-			return true;

-		}

-		if (childEditPart instanceof AppliedStereotypeElementImportEditPart) {

-			((AppliedStereotypeElementImportEditPart) 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 ElementImportAliasEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof AppliedStereotypeElementImportEditPart) {

-			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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java
deleted file mode 100644
index 5686f304c03..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

-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.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class EnumerationEditPart extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2006;

-

-	/**

-	 * @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(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomEnumerationItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

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

-		String prefElementId = "Enumeration";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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_3017) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java
deleted file mode 100644
index 64b10d57f38..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

-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.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class EnumerationEditPartCN extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3025;

-

-	/**

-	 * @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(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomEnumerationItemSemanticEditPolicyCN());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

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

-		String prefElementId = "Enumeration";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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_3017) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
deleted file mode 100644
index c531badf8a7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class EnumerationEnumerationLiteralCompartmentEditPart

-		extends ListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7015;

-

-	/**

-	 * @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());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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_3017) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
deleted file mode 100644
index c5d58d1aa8b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class EnumerationEnumerationLiteralCompartmentEditPartCN

-		extends ListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7031;

-

-	/**

-	 * @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());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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_3017) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationLiteralEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationLiteralEditPart.java
deleted file mode 100644
index 921a0b850bc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationLiteralEditPart.java
+++ /dev/null
@@ -1,838 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.NameLabelIconHelper;

-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.clazz.custom.figure.LiteralEnumerationFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationLiteralItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-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.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 EnumerationLiteralEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3017;

-

-	/**

-	 * @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 EnumerationLiteralEditPart(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 EnumerationLiteralItemSemanticEditPolicy());

-		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 (NameLabelIconHelper.showLabelIcon(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_3017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationLiteralEditPart.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 LiteralEnumerationFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPart.java
deleted file mode 100644
index 65dec834752..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPart.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 5023;

-

-	/**

-	 * @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 (NameLabelIconHelper.showLabelIcon(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_2006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPartCN.java
deleted file mode 100644
index e40a6669820..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPartCN.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 5055;

-

-	/**

-	 * @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 (NameLabelIconHelper.showLabelIcon(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_3025, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationEditPart.java
deleted file mode 100644
index 19db06915a3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationEditPart.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomGeneralizationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.GeneralizationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure;

-

-/**

- * @generated

- */

-public class GeneralizationEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4002;

-

-	/**

-	 * @generated

-	 */

-	public GeneralizationEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new GeneralizationItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomGeneralizationItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AppliedStereotyperGeneralizationEditPart) {

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

-			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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationSetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationSetEditPart.java
deleted file mode 100644
index feecb316f60..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationSetEditPart.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.GeneralizationSet;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.GeneralizationSetLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.GeneralizationSetItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-

-/**

- * @generated

- */

-public class GeneralizationSetEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4020;

-

-	/**

-	 * @generated

-	 */

-	public GeneralizationSetEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new GeneralizationSetItemSemanticEditPolicy());

-		installEditPolicy("CustomDisplay", new GeneralizationSetLabelDisplayEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ConstraintLabelEditPart) {

-			((ConstraintLabelEditPart) childEditPart).setLabel(

-					getPrimaryShape().getConstraintLabel());

-			return true;

-		}

-		if (childEditPart instanceof AppliedStereotypeGeneralizationSetLabelEditPart) {

-			((AppliedStereotypeGeneralizationSetLabelEditPart) 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 ConstraintLabelEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof AppliedStereotypeGeneralizationSetLabelEditPart) {

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

-	}

-

-	/**

-	 * @generated

-	 */

-	public GeneralizationSet getPrimaryShape() {

-		return (GeneralizationSet) getFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowAppliedStereotypeEditPart.java
deleted file mode 100644
index 0717a0b4342..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowAppliedStereotypeEditPart.java
+++ /dev/null
@@ -1,782 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.infra.gmfdiag.common.editpolicies.NoSemanticParserEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 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

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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());

-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NoSemanticParserEditPolicy());

-	}

-

-	/**

-	 * @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_4026, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowConveyedLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowConveyedLabelEditPart.java
deleted file mode 100644
index 8deea72da56..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowConveyedLabelEditPart.java
+++ /dev/null
@@ -1,790 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.custom.policies.InformationFlowCustomLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 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

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_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() {

-		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.InformationFlow_4026, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowEditPart.java
deleted file mode 100644
index 220ca9e14df..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowEditPart.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.custom.figure.InformationFlowFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeInformationFlowLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InformationFlowItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-

-/**

- * @generated

- */

-public class InformationFlowEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4026;

-

-	/**

-	 * @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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPart.java
deleted file mode 100644
index 19bfdefb1b2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPart.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.InformationItemFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInformationItemItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InformationItemItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

-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.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class InformationItemEditPart extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2099;

-

-	/**

-	 * @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(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomInformationItemItemSemanticEditPolicy());

-		// 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.clazz.custom.figure.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() {

-		String prefElementId = "InformationItem";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPartCN.java
deleted file mode 100644
index a1fd9188c72..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPartCN.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.InformationItemFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInformationItemItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InformationItemItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

-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.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class InformationItemEditPartCN extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3040;

-

-	/**

-	 * @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(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomInformationItemItemSemanticEditPolicy());

-		// 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.clazz.custom.figure.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() {

-		String prefElementId = "InformationItem";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemNameEditPart.java
deleted file mode 100644
index 95aa5269216..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemNameEditPart.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 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 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 (NameLabelIconHelper.showLabelIcon(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_2099, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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 (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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemNameEditPartCN.java
deleted file mode 100644
index 7a6b4540d9d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemNameEditPartCN.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 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 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 (NameLabelIconHelper.showLabelIcon(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_3040, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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 (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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java
deleted file mode 100644
index dc52e6e7415..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInstanceSpecificationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

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

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class InstanceSpecificationEditPart extends NamedElementEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2001;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public InstanceSpecificationEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InstanceSpecificationItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomInstanceSpecificationItemSemanticEditPolicy());

-		// 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 InstanceSpecificationFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.InstanceSpecificationFigure

-	 * @generated

-	 */

-	public InstanceSpecificationFigure getPrimaryShape() {

-		return (InstanceSpecificationFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InstanceSpecificationNameEditPart) {

-			((InstanceSpecificationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

-			return true;

-		}

-

-		if (childEditPart instanceof InstanceSpecificationSlotCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getSlotCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((InstanceSpecificationSlotCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InstanceSpecificationNameEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof InstanceSpecificationSlotCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getSlotCompartmentFigure();

-			pane.remove(((InstanceSpecificationSlotCompartmentEditPart) 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 InstanceSpecificationSlotCompartmentEditPart) {

-			return getPrimaryShape().getSlotCompartmentFigure();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "InstanceSpecification";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InstanceSpecificationNameEditPart.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.Slot_3030) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java
deleted file mode 100644
index 2ba3013dddb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInstanceSpecificationItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

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

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class InstanceSpecificationEditPartCN extends NamedElementEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3020;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public InstanceSpecificationEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InstanceSpecificationItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomInstanceSpecificationItemSemanticEditPolicyCN());

-		// 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 InstanceSpecificationFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.InstanceSpecificationFigure

-	 * @generated

-	 */

-	public InstanceSpecificationFigure getPrimaryShape() {

-		return (InstanceSpecificationFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InstanceSpecificationNameEditPartCN) {

-			((InstanceSpecificationNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

-			return true;

-		}

-

-		if (childEditPart instanceof InstanceSpecificationSlotCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getSlotCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((InstanceSpecificationSlotCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InstanceSpecificationNameEditPartCN) {

-			return true;

-		}

-		if (childEditPart instanceof InstanceSpecificationSlotCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getSlotCompartmentFigure();

-			pane.remove(((InstanceSpecificationSlotCompartmentEditPartCN) 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 InstanceSpecificationSlotCompartmentEditPartCN) {

-			return getPrimaryShape().getSlotCompartmentFigure();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "InstanceSpecification";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InstanceSpecificationNameEditPartCN.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.Slot_3030) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationLinkEditPart.java
deleted file mode 100644
index 8b5813df7b8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationLinkEditPart.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.InstanceSpecificationLinkFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationLinkItemSemanticEditPolicy;

-

-/**

- * @generated

- */

-public class InstanceSpecificationLinkEditPart extends ConnectionEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4021;

-

-	/**

-	 * @generated

-	 */

-	public InstanceSpecificationLinkEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InstanceSpecificationLinkItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof SourceISLinkLabelEditPart) {

-			((SourceISLinkLabelEditPart) childEditPart).setLabel(

-					getPrimaryShape().getSourceLabel());

-			return true;

-		}

-		if (childEditPart instanceof TargetISLinkLabelEditPart) {

-			((TargetISLinkLabelEditPart) childEditPart).setLabel(

-					getPrimaryShape().getTargetLabel());

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

-			return true;

-		}

-		if (childEditPart instanceof TargetISLinkLabelEditPart) {

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

-	}

-

-	/**

-	 * @generated

-	 */

-	public InstanceSpecificationLinkFigure getPrimaryShape() {

-		return (InstanceSpecificationLinkFigure) getFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPart.java
deleted file mode 100644
index 2c1903a97a4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPart.java
+++ /dev/null
@@ -1,846 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.custom.policies.InstanceSpecificationNameLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 5002;

-

-	/**

-	 * @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 InstanceSpecificationNameEditPart(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 InstanceSpecificationNameLabelEditPolicy());

-	}

-

-	/**

-	 * @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 (NameLabelIconHelper.showLabelIcon(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.InstanceSpecification_2001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationNameEditPart.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPartCN.java
deleted file mode 100644
index f254ae8147e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPartCN.java
+++ /dev/null
@@ -1,829 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.custom.policies.InstanceSpecificationNameLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 5040;

-

-	/**

-	 * @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 InstanceSpecificationNameEditPartCN(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 InstanceSpecificationNameLabelEditPolicy());

-	}

-

-	/**

-	 * @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.InstanceSpecification_3020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationNameEditPartCN.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPart.java
deleted file mode 100644
index fa5cfe6d27b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPart.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class InstanceSpecificationSlotCompartmentEditPart

-		extends ListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7001;

-

-	/**

-	 * @generated

-	 */

-	public InstanceSpecificationSlotCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.InstanceSpecificationSlotCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InstanceSpecificationSlotCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Slot_3030) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPartCN.java
deleted file mode 100644
index 0d8c7a36f42..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPartCN.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class InstanceSpecificationSlotCompartmentEditPartCN

-		extends ListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7035;

-

-	/**

-	 * @generated

-	 */

-	public InstanceSpecificationSlotCompartmentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.InstanceSpecificationSlotCompartmentEditPartCN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Slot_3030) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPart.java
deleted file mode 100644
index 48ce1790f39..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPart.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceAttributeCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class InterfaceAttributeCompartmentEditPart

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7006;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceAttributeCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.InterfaceAttributeCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceAttributeCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceAttributeCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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_3006) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
deleted file mode 100644
index 9eca32c0bbf..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceAttributeCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class InterfaceAttributeCompartmentEditPartCN

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7027;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceAttributeCompartmentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.InterfaceAttributeCompartmentEditPartCN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceAttributeCompartmentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceAttributeCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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_3006) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java
deleted file mode 100644
index aed31a76428..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java
+++ /dev/null
@@ -1,397 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-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.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.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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

-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.common.figure.node.InterfaceFigure;

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class InterfaceEditPart extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2004;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceCanonicalEditPolicy());

-

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomInterfaceItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		// 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 RedefinableTemplateSignatureEditPart.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 InterfaceFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure

-	 * @generated

-	 */

-	public InterfaceFigure getPrimaryShape() {

-		return (InterfaceFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InterfaceNameEditPart) {

-			((InterfaceNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

-			return true;

-		}

-

-		if (childEditPart instanceof InterfaceAttributeCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((InterfaceAttributeCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof InterfaceOperationCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((InterfaceOperationCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof InterfaceNestedClassifierCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getNestedClassifierFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((InterfaceNestedClassifierCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InterfaceNameEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof InterfaceAttributeCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			pane.remove(((InterfaceAttributeCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof InterfaceOperationCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			pane.remove(((InterfaceOperationCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof InterfaceNestedClassifierCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getNestedClassifierFigure();

-			pane.remove(((InterfaceNestedClassifierCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) 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 InterfaceAttributeCompartmentEditPart) {

-			return getPrimaryShape().getAttributeCompartmentFigure();

-		}

-		if (editPart instanceof InterfaceOperationCompartmentEditPart) {

-			return getPrimaryShape().getOperationCompartmentFigure();

-		}

-		if (editPart instanceof InterfaceNestedClassifierCompartmentEditPart) {

-			return getPrimaryShape().getNestedClassifierFigure();

-		}

-		if (editPart instanceof IBorderItemEditPart) {

-			return getBorderedFigure().getBorderItemContainer();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "Interface";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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));

-	}

-

-	/**

-	 * @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_3006) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Operation_3007) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Reception_3039) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Class_3008) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Interface_3038) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Enumeration_3054) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.PrimitiveType_3048) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.DataType_3043) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Signal_3049) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java
deleted file mode 100644
index 595cac5b4c7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-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.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.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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInterfaceItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class InterfaceEditPartCN extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3023;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceCanonicalEditPolicyCN());

-

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomInterfaceItemSemanticEditPolicyCN());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

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

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

-				case RedefinableTemplateSignatureEditPart.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 InterfaceFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure

-	 * @generated

-	 */

-	public InterfaceFigure getPrimaryShape() {

-		return (InterfaceFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InterfaceNameEditPartCN) {

-			((InterfaceNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

-			return true;

-		}

-

-		if (childEditPart instanceof InterfaceAttributeCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((InterfaceAttributeCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof InterfaceOperationCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((InterfaceOperationCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof InterfaceNestedClassifierCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getNestedClassifierFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((InterfaceNestedClassifierCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InterfaceNameEditPartCN) {

-			return true;

-		}

-		if (childEditPart instanceof InterfaceAttributeCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			pane.remove(((InterfaceAttributeCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof InterfaceOperationCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			pane.remove(((InterfaceOperationCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof InterfaceNestedClassifierCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getNestedClassifierFigure();

-			pane.remove(((InterfaceNestedClassifierCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) 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 InterfaceAttributeCompartmentEditPartCN) {

-			return getPrimaryShape().getAttributeCompartmentFigure();

-		}

-		if (editPart instanceof InterfaceOperationCompartmentEditPartCN) {

-			return getPrimaryShape().getOperationCompartmentFigure();

-		}

-		if (editPart instanceof InterfaceNestedClassifierCompartmentEditPartCN) {

-			return getPrimaryShape().getNestedClassifierFigure();

-		}

-		if (editPart instanceof IBorderItemEditPart) {

-			return getBorderedFigure().getBorderItemContainer();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "Interface";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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));

-	}

-

-	/**

-	 * @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_3006) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Operation_3007) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Reception_3039) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Class_3008) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Interface_3038) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Enumeration_3054) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.PrimitiveType_3048) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.DataType_3043) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Signal_3049) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPart.java
deleted file mode 100644
index 22696e192be..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPart.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 5011;

-

-	/**

-	 * @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 (NameLabelIconHelper.showLabelIcon(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_2004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPartCN.java
deleted file mode 100644
index 86183d66f50..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPartCN.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 5049;

-

-	/**

-	 * @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 (NameLabelIconHelper.showLabelIcon(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_3023, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPart.java
deleted file mode 100644
index c41194c9fb2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPart.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class InterfaceNestedClassifierCompartmentEditPart

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7008;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceNestedClassifierCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.InterfaceNestedClassifierCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceNestedClassifierCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new NestedClazzCompartmentCreationEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Class_3008) {

-				return this;

-			}

-			if (type == UMLElementTypes.Interface_3038) {

-				return this;

-			}

-			if (type == UMLElementTypes.Enumeration_3054) {

-				return this;

-			}

-			if (type == UMLElementTypes.PrimitiveType_3048) {

-				return this;

-			}

-			if (type == UMLElementTypes.DataType_3043) {

-				return this;

-			}

-			if (type == UMLElementTypes.Signal_3049) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPartCN.java
deleted file mode 100644
index c0c5158359e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPartCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class InterfaceNestedClassifierCompartmentEditPartCN

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7029;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceNestedClassifierCompartmentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.InterfaceNestedClassifierCompartmentEditPartCN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceNestedClassifierCompartmentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new NestedClazzCompartmentCreationEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Class_3008) {

-				return this;

-			}

-			if (type == UMLElementTypes.Interface_3038) {

-				return this;

-			}

-			if (type == UMLElementTypes.Enumeration_3054) {

-				return this;

-			}

-			if (type == UMLElementTypes.PrimitiveType_3048) {

-				return this;

-			}

-			if (type == UMLElementTypes.DataType_3043) {

-				return this;

-			}

-			if (type == UMLElementTypes.Signal_3049) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPart.java
deleted file mode 100644
index 2714c10fc9a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPart.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceOperationCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class InterfaceOperationCompartmentEditPart

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7007;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceOperationCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.InterfaceOperationCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceOperationCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceOperationCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Operation_3007) {

-				return this;

-			}

-			if (type == UMLElementTypes.Reception_3039) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPartCN.java
deleted file mode 100644
index 6e6b62178fa..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPartCN.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceOperationCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class InterfaceOperationCompartmentEditPartCN

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7028;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceOperationCompartmentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.InterfaceOperationCompartmentEditPartCN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceOperationCompartmentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceOperationCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Operation_3007) {

-				return this;

-			}

-			if (type == UMLElementTypes.Reception_3039) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationEditPart.java
deleted file mode 100644
index 9d20d8ac96c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationEditPart.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInterfaceRealizationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceRealizationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;

-

-/**

- * @generated

- */

-public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4003;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceRealizationEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceRealizationItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomInterfaceRealizationItemSemanticEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AppliedStereotypeInterfaceRealizationEditPart) {

-			((AppliedStereotypeInterfaceRealizationEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

-			return true;

-		}

-		if (childEditPart instanceof InterfaceRealizationNameEditPart) {

-			((InterfaceRealizationNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

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

-			return true;

-		}

-		if (childEditPart instanceof InterfaceRealizationNameEditPart) {

-			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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationNameEditPart.java
deleted file mode 100644
index 80b2a49f125..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationNameEditPart.java
+++ /dev/null
@@ -1,788 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 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.clazz.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_4003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPart.java
deleted file mode 100644
index 3d87c2412e3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPart.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class ModelEditPart extends PapyrusDiagramEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public final static String MODEL_ID = "PapyrusUMLClassDiagram"; //$NON-NLS-1$

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 1000;

-

-	/**

-	 * @generated

-	 */

-	public ModelEditPart(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 ModelItemSemanticEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartCN.java
deleted file mode 100644
index c35acd4f7e3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartCN.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomModelItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-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.figure.node.PackageFigure;

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class ModelEditPartCN extends NamedElementEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3024;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public ModelEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ModelItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelCanonicalEditPolicyCN());

-

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomModelItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		// 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 RedefinableTemplateSignatureEditPart.VISUAL_ID:

-				case TemplateSignatureEditPart.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 PackageFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure

-	 * @generated

-	 */

-	public PackageFigure getPrimaryShape() {

-		return (PackageFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ModelNameEditPartCN) {

-			((ModelNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

-			return true;

-		}

-

-		if (childEditPart instanceof ModelPackageableElementCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getPackageableElementFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((ModelPackageableElementCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof TemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((TemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ModelNameEditPartCN) {

-			return true;

-		}

-		if (childEditPart instanceof ModelPackageableElementCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getPackageableElementFigure();

-			pane.remove(((ModelPackageableElementCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof TemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((TemplateSignatureEditPart) 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 ModelPackageableElementCompartmentEditPartCN) {

-			return getPrimaryShape().getPackageableElementFigure();

-		}

-		if (editPart instanceof IBorderItemEditPart) {

-			return getBorderedFigure().getBorderItemContainer();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "Model";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ModelNameEditPartCN.VISUAL_ID));

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartTN.java
deleted file mode 100644
index ad438788fc5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartTN.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomModelItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-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.figure.node.PackageFigure;

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class ModelEditPartTN extends NamedElementEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2005;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public ModelEditPartTN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ModelItemSemanticEditPolicyTN());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelCanonicalEditPolicyTN());

-

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomModelItemSemanticEditPolicyTN());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		// 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 RedefinableTemplateSignatureEditPart.VISUAL_ID:

-				case TemplateSignatureEditPart.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 PackageFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure

-	 * @generated

-	 */

-	public PackageFigure getPrimaryShape() {

-		return (PackageFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ModelNameEditPartTN) {

-			((ModelNameEditPartTN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

-			return true;

-		}

-

-		if (childEditPart instanceof ModelPackageableElementCompartmentEditPartTN) {

-			IFigure pane = getPrimaryShape().getPackageableElementFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((ModelPackageableElementCompartmentEditPartTN) childEditPart).getFigure());

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof TemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((TemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ModelNameEditPartTN) {

-			return true;

-		}

-		if (childEditPart instanceof ModelPackageableElementCompartmentEditPartTN) {

-			IFigure pane = getPrimaryShape().getPackageableElementFigure();

-			pane.remove(((ModelPackageableElementCompartmentEditPartTN) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof TemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((TemplateSignatureEditPart) 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 ModelPackageableElementCompartmentEditPartTN) {

-			return getPrimaryShape().getPackageableElementFigure();

-		}

-		if (editPart instanceof IBorderItemEditPart) {

-			return getBorderedFigure().getBorderItemContainer();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "Model";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ModelNameEditPartTN.VISUAL_ID));

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartCN.java
deleted file mode 100644
index 77189f744fb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartCN.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 ModelNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 5052;

-

-	/**

-	 * @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 ModelNameEditPartCN(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 (NameLabelIconHelper.showLabelIcon(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.Model_3024, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelNameEditPartCN.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartTN.java
deleted file mode 100644
index 75c8794a232..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartTN.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 ModelNameEditPartTN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 5020;

-

-	/**

-	 * @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 ModelNameEditPartTN(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 (NameLabelIconHelper.showLabelIcon(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.Model_2005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelNameEditPartTN.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
deleted file mode 100644
index 6d8baf33428..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.notation.NotationPackage;

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

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AbstractPackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelPackageableElementCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

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

-

-/**

- * @generated

- */

-public class ModelPackageableElementCompartmentEditPartCN

-		extends

-		AbstractPackageableElementCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7030;

-

-	/**

-	 * @generated

-	 */

-	public ModelPackageableElementCompartmentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.ModelPackageableElementCompartmentEditPartCN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ModelPackageableElementCompartmentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomContainmentCreationEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.InstanceSpecification_3020) {

-				return this;

-			}

-			if (type == UMLElementTypes.Component_3021) {

-				return this;

-			}

-			if (type == UMLElementTypes.Signal_3022) {

-				return this;

-			}

-			if (type == UMLElementTypes.Interface_3023) {

-				return this;

-			}

-			if (type == UMLElementTypes.Model_3024) {

-				return this;

-			}

-			if (type == UMLElementTypes.Enumeration_3025) {

-				return this;

-			}

-			if (type == UMLElementTypes.Package_3009) {

-				return this;

-			}

-			if (type == UMLElementTypes.Class_3010) {

-				return this;

-			}

-			if (type == UMLElementTypes.PrimitiveType_3026) {

-				return this;

-			}

-			if (type == UMLElementTypes.DataType_3027) {

-				return this;

-			}

-			if (type == UMLElementTypes.Comment_3028) {

-				return this;

-			}

-			if (type == UMLElementTypes.Constraint_3029) {

-				return this;

-			}

-			if (type == UMLElementTypes.InformationItem_3040) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartTN.java
deleted file mode 100644
index f7efbc2d35b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartTN.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.notation.NotationPackage;

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

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AbstractPackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelPackageableElementCompartmentItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

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

-

-/**

- * @generated

- */

-public class ModelPackageableElementCompartmentEditPartTN

-		extends

-		AbstractPackageableElementCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7009;

-

-	/**

-	 * @generated

-	 */

-	public ModelPackageableElementCompartmentEditPartTN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.ModelPackageableElementCompartmentEditPartTN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ModelPackageableElementCompartmentItemSemanticEditPolicyTN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicyTN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomContainmentCreationEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.InstanceSpecification_3020) {

-				return this;

-			}

-			if (type == UMLElementTypes.Component_3021) {

-				return this;

-			}

-			if (type == UMLElementTypes.Signal_3022) {

-				return this;

-			}

-			if (type == UMLElementTypes.Interface_3023) {

-				return this;

-			}

-			if (type == UMLElementTypes.Model_3024) {

-				return this;

-			}

-			if (type == UMLElementTypes.Enumeration_3025) {

-				return this;

-			}

-			if (type == UMLElementTypes.Package_3009) {

-				return this;

-			}

-			if (type == UMLElementTypes.Class_3010) {

-				return this;

-			}

-			if (type == UMLElementTypes.PrimitiveType_3026) {

-				return this;

-			}

-			if (type == UMLElementTypes.DataType_3027) {

-				return this;

-			}

-			if (type == UMLElementTypes.Comment_3028) {

-				return this;

-			}

-			if (type == UMLElementTypes.Constraint_3029) {

-				return this;

-			}

-			if (type == UMLElementTypes.InformationItem_3040) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/MultiDependencyLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/MultiDependencyLabelEditPart.java
deleted file mode 100644
index 9ab63e691fa..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/MultiDependencyLabelEditPart.java
+++ /dev/null
@@ -1,812 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 MultiDependencyLabelEditPart extends LabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 1;

-

-	/**

-	 * @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.clazz.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID), new Point(0, 0));

-	}

-

-	/**

-	 * @generated

-	 */

-	public MultiDependencyLabelEditPart(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.Dependency_2014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.MultiDependencyLabelEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForClassEditPart.java
deleted file mode 100644
index 20952734055..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForClassEditPart.java
+++ /dev/null
@@ -1,839 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.NameLabelIconHelper;

-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.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedClassForClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-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.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 NestedClassForClassEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3014;

-

-	/**

-	 * @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 NestedClassForClassEditPart(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 NestedClassForClassItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @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 (NameLabelIconHelper.showLabelIcon(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_3014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart.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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForComponentEditPart.java
deleted file mode 100644
index a3b2caf9d84..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForComponentEditPart.java
+++ /dev/null
@@ -1,837 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.NameLabelIconHelper;

-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.clazz.edit.policies.NestedClassForComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-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.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 NestedClassForComponentEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3004;

-

-	/**

-	 * @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 NestedClassForComponentEditPart(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 NestedClassForComponentItemSemanticEditPolicy());

-		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 (NameLabelIconHelper.showLabelIcon(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_3004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForComponentEditPart.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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForInterfaceEditPart.java
deleted file mode 100644
index 454e46f7a78..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForInterfaceEditPart.java
+++ /dev/null
@@ -1,837 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.NameLabelIconHelper;

-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.clazz.edit.policies.NestedClassForInterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-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.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 NestedClassForInterfaceEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3008;

-

-	/**

-	 * @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 NestedClassForInterfaceEditPart(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 NestedClassForInterfaceItemSemanticEditPolicy());

-		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 (NameLabelIconHelper.showLabelIcon(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_3008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart.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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForClassEditPart.java
deleted file mode 100644
index c8344259689..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForClassEditPart.java
+++ /dev/null
@@ -1,822 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedDataTypeForClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 NestedDataTypeForClassEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3044;

-

-	/**

-	 * @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 NestedDataTypeForClassEditPart(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 NestedDataTypeForClassItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @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.DataType_3044, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedDataTypeForClassEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForComponentEditPart.java
deleted file mode 100644
index 473903881ec..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForComponentEditPart.java
+++ /dev/null
@@ -1,820 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedDataTypeForComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 NestedDataTypeForComponentEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3045;

-

-	/**

-	 * @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 NestedDataTypeForComponentEditPart(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 NestedDataTypeForComponentItemSemanticEditPolicy());

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

-		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_3045, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedDataTypeForComponentEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForInterfaceEditPart.java
deleted file mode 100644
index 7a1c79e5f3e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForInterfaceEditPart.java
+++ /dev/null
@@ -1,820 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedDataTypeForInterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 NestedDataTypeForInterfaceEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3043;

-

-	/**

-	 * @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 NestedDataTypeForInterfaceEditPart(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 NestedDataTypeForInterfaceItemSemanticEditPolicy());

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

-		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_3043, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedDataTypeForInterfaceEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForClassEditPart.java
deleted file mode 100644
index a0fa2fddd2b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForClassEditPart.java
+++ /dev/null
@@ -1,822 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedEnumerationForClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 NestedEnumerationForClassEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3052;

-

-	/**

-	 * @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 NestedEnumerationForClassEditPart(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 NestedEnumerationForClassItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @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.Enumeration_3052, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedEnumerationForClassEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForComponentEditPart.java
deleted file mode 100644
index aeb99431a1f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForComponentEditPart.java
+++ /dev/null
@@ -1,822 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedEnumerationForComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 NestedEnumerationForComponentEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3053;

-

-	/**

-	 * @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 NestedEnumerationForComponentEditPart(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 NestedEnumerationForComponentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @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.Enumeration_3053, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedEnumerationForComponentEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForInterfaceEditPart.java
deleted file mode 100644
index bd616e35a9d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForInterfaceEditPart.java
+++ /dev/null
@@ -1,822 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedEnumerationForInterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 NestedEnumerationForInterfaceEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3054;

-

-	/**

-	 * @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 NestedEnumerationForInterfaceEditPart(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 NestedEnumerationForInterfaceItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @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.Enumeration_3054, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedEnumerationForInterfaceEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForClassEditPart.java
deleted file mode 100644
index 3b810927632..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForClassEditPart.java
+++ /dev/null
@@ -1,822 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedInterfaceForClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 NestedInterfaceForClassEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3036;

-

-	/**

-	 * @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 NestedInterfaceForClassEditPart(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 NestedInterfaceForClassItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @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.Interface_3036, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForClassEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForComponentEditPart.java
deleted file mode 100644
index 9613e93a72f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForComponentEditPart.java
+++ /dev/null
@@ -1,820 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedInterfaceForComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 NestedInterfaceForComponentEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3037;

-

-	/**

-	 * @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 NestedInterfaceForComponentEditPart(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 NestedInterfaceForComponentItemSemanticEditPolicy());

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

-		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_3037, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForComponentEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForInterfaceEditPart.java
deleted file mode 100644
index 10d3f1fbe0c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForInterfaceEditPart.java
+++ /dev/null
@@ -1,820 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedInterfaceForInterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 NestedInterfaceForInterfaceEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3038;

-

-	/**

-	 * @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 NestedInterfaceForInterfaceEditPart(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 NestedInterfaceForInterfaceItemSemanticEditPolicy());

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

-		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_3038, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForInterfaceEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForClassEditPart.java
deleted file mode 100644
index 96dabc577c6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForClassEditPart.java
+++ /dev/null
@@ -1,823 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedPrimitiveTypeForClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 NestedPrimitiveTypeForClassEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3047;

-

-	/**

-	 * @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 NestedPrimitiveTypeForClassEditPart(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 NestedPrimitiveTypeForClassItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @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.PrimitiveType_3047, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedPrimitiveTypeForClassEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForComponentEditPart.java
deleted file mode 100644
index 4bb1daa3a8e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForComponentEditPart.java
+++ /dev/null
@@ -1,822 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedPrimitiveTypeForComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 NestedPrimitiveTypeForComponentEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3046;

-

-	/**

-	 * @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 NestedPrimitiveTypeForComponentEditPart(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 NestedPrimitiveTypeForComponentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @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.PrimitiveType_3046, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedPrimitiveTypeForComponentEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForInterfaceEditPart.java
deleted file mode 100644
index 72f9b230aaf..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForInterfaceEditPart.java
+++ /dev/null
@@ -1,822 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedPrimitiveTypeForInterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 NestedPrimitiveTypeForInterfaceEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3048;

-

-	/**

-	 * @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 NestedPrimitiveTypeForInterfaceEditPart(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 NestedPrimitiveTypeForInterfaceItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @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.PrimitiveType_3048, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedPrimitiveTypeForInterfaceEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForClassEditPart.java
deleted file mode 100644
index a3545d89a0f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForClassEditPart.java
+++ /dev/null
@@ -1,822 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedSignalForClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 NestedSignalForClassEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3050;

-

-	/**

-	 * @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 NestedSignalForClassEditPart(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 NestedSignalForClassItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @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.Signal_3050, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedSignalForClassEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForComponentEditPart.java
deleted file mode 100644
index 29c11013871..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForComponentEditPart.java
+++ /dev/null
@@ -1,820 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedSignalForComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 NestedSignalForComponentEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3051;

-

-	/**

-	 * @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 NestedSignalForComponentEditPart(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 NestedSignalForComponentItemSemanticEditPolicy());

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

-		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_3051, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedSignalForComponentEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForInterfaceEditPart.java
deleted file mode 100644
index 75ab34d4a27..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForInterfaceEditPart.java
+++ /dev/null
@@ -1,820 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedSignalForInterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 NestedSignalForInterfaceEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3049;

-

-	/**

-	 * @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 NestedSignalForInterfaceEditPart(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 NestedSignalForInterfaceItemSemanticEditPolicy());

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

-		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_3049, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedSignalForInterfaceEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForClassEditPart.java
deleted file mode 100644
index 060e94d8252..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForClassEditPart.java
+++ /dev/null
@@ -1,826 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.OperationFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationForClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 OperationForClassEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3013;

-

-	/**

-	 * @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 OperationForClassEditPart(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 OperationForClassItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeOperationDisplayEditPolicy());

-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new OperationLabelEditPolicy());

-	}

-

-	/**

-	 * @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.Operation_3013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart.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 (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 OperationFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForComponentEditPart.java
deleted file mode 100644
index 7074be993a3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForComponentEditPart.java
+++ /dev/null
@@ -1,826 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.OperationFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 OperationForComponentEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3003;

-

-	/**

-	 * @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 OperationForComponentEditPart(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 OperationItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeOperationDisplayEditPolicy());

-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new OperationLabelEditPolicy());

-	}

-

-	/**

-	 * @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.Operation_3003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart.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 (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 OperationFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForDataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForDataTypeEditPart.java
deleted file mode 100644
index 2930951c9d8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForDataTypeEditPart.java
+++ /dev/null
@@ -1,826 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.OperationFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationForDataTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 OperationForDataTypeEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3019;

-

-	/**

-	 * @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 OperationForDataTypeEditPart(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 OperationForDataTypeItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeOperationDisplayEditPolicy());

-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new OperationLabelEditPolicy());

-	}

-

-	/**

-	 * @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.Operation_3019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForDataTypeEditPart.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 (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 OperationFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForInterfaceEditpart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForInterfaceEditpart.java
deleted file mode 100644
index 76b6086087d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForInterfaceEditpart.java
+++ /dev/null
@@ -1,826 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.OperationFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationForInterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 OperationForInterfaceEditpart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3007;

-

-	/**

-	 * @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 OperationForInterfaceEditpart(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 OperationForInterfaceItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeOperationDisplayEditPolicy());

-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new OperationLabelEditPolicy());

-	}

-

-	/**

-	 * @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.Operation_3007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForInterfaceEditpart.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 (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 OperationFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForPrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForPrimitiveTypeEditPart.java
deleted file mode 100644
index 364d5656af4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForPrimitiveTypeEditPart.java
+++ /dev/null
@@ -1,826 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.OperationFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationForPrimitiveTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 OperationForPrimitiveTypeEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3042;

-

-	/**

-	 * @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 OperationForPrimitiveTypeEditPart(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 OperationForPrimitiveTypeItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeOperationDisplayEditPolicy());

-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new OperationLabelEditPolicy());

-	}

-

-	/**

-	 * @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.Operation_3042, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForPrimitiveTypeEditPart.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 (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 OperationFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationTemplateParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationTemplateParameterEditPart.java
deleted file mode 100644
index dd749dc77f0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationTemplateParameterEditPart.java
+++ /dev/null
@@ -1,823 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateParameterFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.OperationTemplateParamaterDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationTemplateParameterItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 OperationTemplateParameterEditPart extends CompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3035;

-

-	/**

-	 * @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 OperationTemplateParameterEditPart(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 OperationTemplateParameterItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(TemplateParamaterDisplayEditPolicy.TEMPLATE_PARAMETER_DISPLAY, new OperationTemplateParamaterDisplayEditPolicy());

-	}

-

-	/**

-	 * @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.OperationTemplateParameter_3035, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationTemplateParameterEditPart.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 (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 TemplateParameterFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPart.java
deleted file mode 100644
index fd798bcdf9c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPart.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomViewComponentEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomPackageItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-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.figure.node.PackageFigure;

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class PackageEditPart extends NamedElementEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2007;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public PackageEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackageItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageCanonicalEditPolicy());

-

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new CustomViewComponentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomPackageItemSemanticEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		// 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 RedefinableTemplateSignatureEditPart.VISUAL_ID:

-				case TemplateSignatureEditPart.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 PackageFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure

-	 * @generated

-	 */

-	public PackageFigure getPrimaryShape() {

-		return (PackageFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof PackageNameEditPart) {

-			((PackageNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

-			return true;

-		}

-

-		if (childEditPart instanceof PackagePackageableElementCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getPackageableElementFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((PackagePackageableElementCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof TemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((TemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof PackageNameEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof PackagePackageableElementCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getPackageableElementFigure();

-			pane.remove(((PackagePackageableElementCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof TemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((TemplateSignatureEditPart) 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 PackagePackageableElementCompartmentEditPart) {

-			return getPrimaryShape().getPackageableElementFigure();

-		}

-		if (editPart instanceof IBorderItemEditPart) {

-			return getBorderedFigure().getBorderItemContainer();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "Package";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageNameEditPart.VISUAL_ID));

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPartCN.java
deleted file mode 100644
index 2ed34c4ca46..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPartCN.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-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.figure.node.PackageFigure;

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class PackageEditPartCN extends NamedElementEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3009;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public PackageEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackageItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageCanonicalEditPolicyCN());

-

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		// 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 RedefinableTemplateSignatureEditPart.VISUAL_ID:

-				case TemplateSignatureEditPart.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 PackageFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure

-	 * @generated

-	 */

-	public PackageFigure getPrimaryShape() {

-		return (PackageFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof PackageNameEditPartCN) {

-			((PackageNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

-			return true;

-		}

-

-		if (childEditPart instanceof PackagePackageableElementCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getPackageableElementFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((PackagePackageableElementCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof TemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((TemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof PackageNameEditPartCN) {

-			return true;

-		}

-		if (childEditPart instanceof PackagePackageableElementCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getPackageableElementFigure();

-			pane.remove(((PackagePackageableElementCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof TemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((TemplateSignatureEditPart) 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 PackagePackageableElementCompartmentEditPartCN) {

-			return getPrimaryShape().getPackageableElementFigure();

-		}

-		if (editPart instanceof IBorderItemEditPart) {

-			return getBorderedFigure().getBorderItemContainer();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "Package";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageNameEditPartCN.VISUAL_ID));

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageImportEditPart.java
deleted file mode 100644
index 9ed7696bebc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageImportEditPart.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageImportItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypePackageImportLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

-

-/**

- * @generated

- */

-public class PackageImportEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4010;

-

-	/**

-	 * @generated

-	 */

-	public PackageImportEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackageImportItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePackageImportLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AppliedStereotypePackageImportEditPart) {

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

-			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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageMergeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageMergeEditPart.java
deleted file mode 100644
index 3fa277d99da..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageMergeEditPart.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageMergeItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypePackageMergeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

-

-/**

- * @generated

- */

-public class PackageMergeEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4011;

-

-	/**

-	 * @generated

-	 */

-	public PackageMergeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackageMergeItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePackageMergeLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AppliedStereotypePackageMergeEditPart) {

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

-			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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPart.java
deleted file mode 100644
index 39a6f7a9d08..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPart.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 PackageNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 5026;

-

-	/**

-	 * @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 PackageNameEditPart(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 (NameLabelIconHelper.showLabelIcon(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.Package_2007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageNameEditPart.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPartCN.java
deleted file mode 100644
index 4c84402f447..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPartCN.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 PackageNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 5017;

-

-	/**

-	 * @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 PackageNameEditPartCN(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 (NameLabelIconHelper.showLabelIcon(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.Package_3009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageNameEditPartCN.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java
deleted file mode 100644
index 404b5a81f4f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.notation.NotationPackage;

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

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AbstractPackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackagePackageableElementCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

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

-

-/**

- * @generated

- */

-public class PackagePackageableElementCompartmentEditPart

-		extends

-		AbstractPackageableElementCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7016;

-

-	/**

-	 * @generated

-	 */

-	public PackagePackageableElementCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.PackagePackageableElementCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackagePackageableElementCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomContainmentCreationEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.InstanceSpecification_3020) {

-				return this;

-			}

-			if (type == UMLElementTypes.Component_3021) {

-				return this;

-			}

-			if (type == UMLElementTypes.Signal_3022) {

-				return this;

-			}

-			if (type == UMLElementTypes.Interface_3023) {

-				return this;

-			}

-			if (type == UMLElementTypes.Model_3024) {

-				return this;

-			}

-			if (type == UMLElementTypes.Enumeration_3025) {

-				return this;

-			}

-			if (type == UMLElementTypes.Package_3009) {

-				return this;

-			}

-			if (type == UMLElementTypes.Class_3010) {

-				return this;

-			}

-			if (type == UMLElementTypes.PrimitiveType_3026) {

-				return this;

-			}

-			if (type == UMLElementTypes.DataType_3027) {

-				return this;

-			}

-			if (type == UMLElementTypes.Comment_3028) {

-				return this;

-			}

-			if (type == UMLElementTypes.Constraint_3029) {

-				return this;

-			}

-			if (type == UMLElementTypes.InformationItem_3040) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
deleted file mode 100644
index da462ab8ada..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.notation.NotationPackage;

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

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AbstractPackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackagePackageableElementCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

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

-

-/**

- * @generated

- */

-public class PackagePackageableElementCompartmentEditPartCN

-		extends

-		AbstractPackageableElementCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7010;

-

-	/**

-	 * @generated

-	 */

-	public PackagePackageableElementCompartmentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.PackagePackageableElementCompartmentEditPartCN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackagePackageableElementCompartmentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomContainmentCreationEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.InstanceSpecification_3020) {

-				return this;

-			}

-			if (type == UMLElementTypes.Component_3021) {

-				return this;

-			}

-			if (type == UMLElementTypes.Signal_3022) {

-				return this;

-			}

-			if (type == UMLElementTypes.Interface_3023) {

-				return this;

-			}

-			if (type == UMLElementTypes.Model_3024) {

-				return this;

-			}

-			if (type == UMLElementTypes.Enumeration_3025) {

-				return this;

-			}

-			if (type == UMLElementTypes.Package_3009) {

-				return this;

-			}

-			if (type == UMLElementTypes.Class_3010) {

-				return this;

-			}

-			if (type == UMLElementTypes.PrimitiveType_3026) {

-				return this;

-			}

-			if (type == UMLElementTypes.DataType_3027) {

-				return this;

-			}

-			if (type == UMLElementTypes.Comment_3028) {

-				return this;

-			}

-			if (type == UMLElementTypes.Constraint_3029) {

-				return this;

-			}

-			if (type == UMLElementTypes.InformationItem_3040) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeAttributeCompartmentEditPart.java
deleted file mode 100644
index 7d6c546f9ad..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeAttributeCompartmentEditPart.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeAttributeCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class PrimitiveTypeAttributeCompartmentEditPart

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7039;

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeAttributeCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.PrimitiveTypeAttributeCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PrimitiveTypeAttributeCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeAttributeCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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_3041) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeAttributeCompartmentEditPartCN.java
deleted file mode 100644
index dd90e380e4b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeAttributeCompartmentEditPartCN.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeAttributeCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class PrimitiveTypeAttributeCompartmentEditPartCN

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7041;

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeAttributeCompartmentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.PrimitiveTypeAttributeCompartmentEditPartCN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PrimitiveTypeAttributeCompartmentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeAttributeCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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_3041) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java
deleted file mode 100644
index 3444645ff0d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomViewComponentEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class PrimitiveTypeEditPart extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2009;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PrimitiveTypeItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomClassItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new CustomViewComponentEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

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

-		}

-

-		if (childEditPart instanceof PrimitiveTypeAttributeCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((PrimitiveTypeAttributeCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof PrimitiveTypeOperationCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((PrimitiveTypeOperationCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof PrimitiveTypeNameEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof PrimitiveTypeAttributeCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			pane.remove(((PrimitiveTypeAttributeCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof PrimitiveTypeOperationCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			pane.remove(((PrimitiveTypeOperationCompartmentEditPart) 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 PrimitiveTypeAttributeCompartmentEditPart) {

-			return getPrimaryShape().getAttributeCompartmentFigure();

-		}

-		if (editPart instanceof PrimitiveTypeOperationCompartmentEditPart) {

-			return getPrimaryShape().getOperationCompartmentFigure();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "PrimitiveType";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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));

-	}

-

-	/**

-	 * @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_3041) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Operation_3042) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java
deleted file mode 100644
index 21d004e172e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomClassItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class PrimitiveTypeEditPartCN extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3026;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PrimitiveTypeItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomClassItemSemanticEditPolicyCN());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

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

-		}

-

-		if (childEditPart instanceof PrimitiveTypeAttributeCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((PrimitiveTypeAttributeCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-

-		if (childEditPart instanceof PrimitiveTypeOperationCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((PrimitiveTypeOperationCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof PrimitiveTypeNameEditPartCN) {

-			return true;

-		}

-		if (childEditPart instanceof PrimitiveTypeAttributeCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			pane.remove(((PrimitiveTypeAttributeCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof PrimitiveTypeOperationCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			pane.remove(((PrimitiveTypeOperationCompartmentEditPartCN) 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 PrimitiveTypeAttributeCompartmentEditPartCN) {

-			return getPrimaryShape().getAttributeCompartmentFigure();

-		}

-		if (editPart instanceof PrimitiveTypeOperationCompartmentEditPartCN) {

-			return getPrimaryShape().getOperationCompartmentFigure();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "PrimitiveType";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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));

-	}

-

-	/**

-	 * @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_3041) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeAttributeCompartmentEditPartCN.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.Operation_3042) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeOperationCompartmentEditPartCN.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPart.java
deleted file mode 100644
index e7be572bdd9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPart.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 5032;

-

-	/**

-	 * @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 (NameLabelIconHelper.showLabelIcon(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_2009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPartCN.java
deleted file mode 100644
index 4712c0772b3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPartCN.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 5058;

-

-	/**

-	 * @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 (NameLabelIconHelper.showLabelIcon(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_3026, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeOperationCompartmentEditPart.java
deleted file mode 100644
index c87a87c8bf7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeOperationCompartmentEditPart.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeOperationCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class PrimitiveTypeOperationCompartmentEditPart

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7040;

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeOperationCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.PrimitiveTypeOperationCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PrimitiveTypeOperationCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeOperationCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Operation_3042) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeOperationCompartmentEditPartCN.java
deleted file mode 100644
index eadc7836aaf..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeOperationCompartmentEditPartCN.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeOperationCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class PrimitiveTypeOperationCompartmentEditPartCN

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7042;

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeOperationCompartmentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.PrimitiveTypeOperationCompartmentEditPartCN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PrimitiveTypeOperationCompartmentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeOperationCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.Operation_3042) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ProfileApplicationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ProfileApplicationEditPart.java
deleted file mode 100644
index b3eacf383ab..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ProfileApplicationEditPart.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ProfileApplicationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

-

-/**

- * @generated

- */

-public class ProfileApplicationEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4012;

-

-	/**

-	 * @generated

-	 */

-	public ProfileApplicationEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ProfileApplicationItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-	}

-

-	/**

-	 * 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForClassEditPart.java
deleted file mode 100644
index a97e64e03ad..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForClassEditPart.java
+++ /dev/null
@@ -1,826 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.PropertyFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyForClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-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.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 PropertyForClassEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3012;

-

-	/**

-	 * @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 PropertyForClassEditPart(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 PropertyForClassItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePropertyDisplayEditPolicy());

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

-		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_3012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart.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 (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 PropertyFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForComponentEditPart.java
deleted file mode 100644
index 991a06932c5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForComponentEditPart.java
+++ /dev/null
@@ -1,826 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.PropertyFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyForComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-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.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 PropertyForComponentEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3002;

-

-	/**

-	 * @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 PropertyForComponentEditPart(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 PropertyForComponentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePropertyDisplayEditPolicy());

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

-		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_3002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart.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 (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 PropertyFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForInterfaceEditPart.java
deleted file mode 100644
index bbda8d38358..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForInterfaceEditPart.java
+++ /dev/null
@@ -1,826 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.PropertyFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyForInterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-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.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 PropertyForInterfaceEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3006;

-

-	/**

-	 * @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 PropertyForInterfaceEditPart(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 PropertyForInterfaceItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePropertyDisplayEditPolicy());

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

-		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_3006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForInterfaceEditPart.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 (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 PropertyFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForSignalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForSignalEditPart.java
deleted file mode 100644
index 2cc82cd5a59..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForSignalEditPart.java
+++ /dev/null
@@ -1,826 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.PropertyFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyForSignalItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-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.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 PropertyForSignalEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3005;

-

-	/**

-	 * @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 PropertyForSignalEditPart(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 PropertyForSignalItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePropertyDisplayEditPolicy());

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

-		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_3005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForSignalEditPart.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 (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 PropertyFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforDataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforDataTypeEditPart.java
deleted file mode 100644
index 93389b29c84..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforDataTypeEditPart.java
+++ /dev/null
@@ -1,826 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.PropertyFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyforDataTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-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.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 PropertyforDataTypeEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3018;

-

-	/**

-	 * @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 PropertyforDataTypeEditPart(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 PropertyforDataTypeItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePropertyDisplayEditPolicy());

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

-		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_3018, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart.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 (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 PropertyFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforPrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforPrimitiveTypeEditPart.java
deleted file mode 100644
index 9a6e9b3659a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforPrimitiveTypeEditPart.java
+++ /dev/null
@@ -1,826 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.PropertyFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyforPrimitiveTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-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.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 PropertyforPrimitiveTypeEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3041;

-

-	/**

-	 * @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 PropertyforPrimitiveTypeEditPart(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 PropertyforPrimitiveTypeItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePropertyDisplayEditPolicy());

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

-		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_3041, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforPrimitiveTypeEditPart.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 (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 PropertyFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationEditPart.java
deleted file mode 100644
index 3d2dab7d6c6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationEditPart.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomRealizationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.RealizationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;

-

-/**

- * @generated

- */

-public class RealizationEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4005;

-

-	/**

-	 * @generated

-	 */

-	public RealizationEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new RealizationItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomRealizationItemSemanticEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AppliedStereotypeRealizationEditPart) {

-			((AppliedStereotypeRealizationEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

-			return true;

-		}

-		if (childEditPart instanceof RealizationNameEditPart) {

-			((RealizationNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

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

-			return true;

-		}

-		if (childEditPart instanceof RealizationNameEditPart) {

-			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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationNameEditPart.java
deleted file mode 100644
index c2a179bf747..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationNameEditPart.java
+++ /dev/null
@@ -1,788 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 6013;

-

-	/**

-	 * @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.clazz.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_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionEditPart.java
deleted file mode 100644
index 7b3b182dcf6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionEditPart.java
+++ /dev/null
@@ -1,838 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.NameLabelIconHelper;

-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.clazz.custom.figure.ReceptionFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ReceptionItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-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.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 ReceptionEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3011;

-

-	/**

-	 * @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 ReceptionEditPart(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 ReceptionItemSemanticEditPolicy());

-		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 (NameLabelIconHelper.showLabelIcon(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.Reception_3011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart.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 ReceptionFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionInInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionInInterfaceEditPart.java
deleted file mode 100644
index 2e99b6b64df..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionInInterfaceEditPart.java
+++ /dev/null
@@ -1,837 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.custom.figure.ReceptionFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ReceptionInInterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 ReceptionInInterfaceEditPart extends CompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3039;

-

-	/**

-	 * @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 ReceptionInInterfaceEditPart(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 ReceptionInInterfaceItemSemanticEditPolicy());

-		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 (NameLabelIconHelper.showLabelIcon(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.Reception_3039, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionInInterfaceEditPart.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 ReceptionFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureEditPart.java
deleted file mode 100644
index 104f6de52a3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureEditPart.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractRedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomRedefinableTemplateSignatureItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.RedefinableTemplateSignatureItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTemplateSignatureEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3015;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public RedefinableTemplateSignatureEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, getPrimaryDragEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new RedefinableTemplateSignatureItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomRedefinableTemplateSignatureItemSemanticEditPolicy());

-		// 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 TemplateFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateFigure

-	 * @generated

-	 */

-	public TemplateFigure getPrimaryShape() {

-		return (TemplateFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-

-		if (childEditPart instanceof RedefinableTemplateSignatureTemplateParameterCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getTemplateParameterRectangle();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((RedefinableTemplateSignatureTemplateParameterCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof RedefinableTemplateSignatureTemplateParameterCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getTemplateParameterRectangle();

-			pane.remove(((RedefinableTemplateSignatureTemplateParameterCompartmentEditPart) 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 RedefinableTemplateSignatureTemplateParameterCompartmentEditPart) {

-			return getPrimaryShape().getTemplateParameterRectangle();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "RedefinableTemplateSignature";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @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.ClassifierTemplateParameter_3031) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.ConnectableElementTemplateParameter_3034) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.OperationTemplateParameter_3035) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.TemplateParameter_3016) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.java
deleted file mode 100644
index 0bf43789cba..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.GraphicalEditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CRedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.RedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class RedefinableTemplateSignatureTemplateParameterCompartmentEditPart

-		extends ListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7014;

-

-	/**

-	 * @generated

-	 */

-	public RedefinableTemplateSignatureTemplateParameterCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.RedefinableTemplateSignatureTemplateParameterCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new RedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.RedefinableTemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CRedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.ClassifierTemplateParameter_3031) {

-				return this;

-			}

-			if (type == UMLElementTypes.ConnectableElementTemplateParameter_3034) {

-				return this;

-			}

-			if (type == UMLElementTypes.OperationTemplateParameter_3035) {

-				return this;

-			}

-			if (type == UMLElementTypes.TemplateParameter_3016) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java
deleted file mode 100644
index c0554781473..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.StackLayout;

-import org.eclipse.draw2d.geometry.Dimension;

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

-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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomShortcutDiagramItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ShortCutDiagramItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortCutDiagramEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShortCutDiagramEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.DiagramNodeFigure;

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2016;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public ShortCutDiagramEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ShortCutDiagramItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicyRoles.OPEN_ROLE, new ShortCutDiagramEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomShortcutDiagramItemSemanticEditPolicy());

-		// 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 DiagramNameEditPart.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 DiagramNodeFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.DiagramNodeFigure

-	 * @generated

-	 */

-	public DiagramNodeFigure getPrimaryShape() {

-		return (DiagramNodeFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof DiagramNameEditPart) {

-			BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH);

-			locator.setBorderItemOffset(new Dimension(-20, -20));

-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

-			super.addBorderItem(borderItemContainer, borderItemEditPart);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "ShortCutDiagram";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public EditPart getPrimaryChildEditPart() {

-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DiagramNameEditPart.VISUAL_ID));

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPart.java
deleted file mode 100644
index c947f24bb5e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPart.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalAttributeCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class SignalAttributeCompartmentEditPart

-		extends ListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7005;

-

-	/**

-	 * @generated

-	 */

-	public SignalAttributeCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.SignalAttributeCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SignalAttributeCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalAttributeCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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_3005) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPartCN.java
deleted file mode 100644
index 30cef3c97d2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPartCN.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalAttributeCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class SignalAttributeCompartmentEditPartCN

-		extends

-		ResizeableListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7026;

-

-	/**

-	 * @generated

-	 */

-	public SignalAttributeCompartmentEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.SignalAttributeCompartmentEditPartCN_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SignalAttributeCompartmentItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalAttributeCompartmentCanonicalEditPolicyCN());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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_3005) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java
deleted file mode 100644
index b4666c03a54..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-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.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.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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomSignalItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class SignalEditPart extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2003;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public SignalEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SignalItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalCanonicalEditPolicy());

-

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomSignalItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		// 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 RedefinableTemplateSignatureEditPart.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 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;

-		}

-

-		if (childEditPart instanceof SignalAttributeCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((SignalAttributeCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof SignalNameEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof SignalAttributeCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			pane.remove(((SignalAttributeCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) 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 SignalAttributeCompartmentEditPart) {

-			return getPrimaryShape().getAttributeCompartmentFigure();

-		}

-		if (editPart instanceof IBorderItemEditPart) {

-			return getBorderedFigure().getBorderItemContainer();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "Signal";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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));

-	}

-

-	/**

-	 * @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_3005) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalAttributeCompartmentEditPart.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java
deleted file mode 100644
index a3ee98bc2c2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-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.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.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.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomSignalItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class SignalEditPartCN extends ClassifierEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3022;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public SignalEditPartCN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SignalItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalCanonicalEditPolicyCN());

-

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomSignalItemSemanticEditPolicyCN());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		// 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 RedefinableTemplateSignatureEditPart.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 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;

-		}

-

-		if (childEditPart instanceof SignalAttributeCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((SignalAttributeCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-

-		//Papyrus Gencode :precise the locator for a template signature

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST);

-			getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof SignalNameEditPartCN) {

-			return true;

-		}

-		if (childEditPart instanceof SignalAttributeCompartmentEditPartCN) {

-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			pane.remove(((SignalAttributeCompartmentEditPartCN) childEditPart).getFigure());

-			return true;

-		}

-		if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) 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 SignalAttributeCompartmentEditPartCN) {

-			return getPrimaryShape().getAttributeCompartmentFigure();

-		}

-		if (editPart instanceof IBorderItemEditPart) {

-			return getBorderedFigure().getBorderItemContainer();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "Signal";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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));

-	}

-

-	/**

-	 * @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_3005) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalAttributeCompartmentEditPartCN.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPart.java
deleted file mode 100644
index 6ee173a9fb5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPart.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 5008;

-

-	/**

-	 * @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 (NameLabelIconHelper.showLabelIcon(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_2003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPartCN.java
deleted file mode 100644
index 85d3b4b0c37..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPartCN.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NameLabelIconHelper;

-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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 5046;

-

-	/**

-	 * @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 (NameLabelIconHelper.showLabelIcon(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_3022, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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);

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SlotEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SlotEditPart.java
deleted file mode 100644
index 467c21cdc85..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SlotEditPart.java
+++ /dev/null
@@ -1,822 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.SlotDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SlotItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-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 SlotEditPart extends

-		UMLCompartmentEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3030;

-

-	/**

-	 * @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 SlotEditPart(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 SlotItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(SlotDisplayEditPolicy.SLOT_DISPLAY, new SlotDisplayEditPolicy());

-	}

-

-	/**

-	 * @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.Slot_3030, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SlotEditPart.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 (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();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SourceISLinkLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SourceISLinkLabelEditPart.java
deleted file mode 100644
index 22dcedc2fb9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SourceISLinkLabelEditPart.java
+++ /dev/null
@@ -1,783 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.custom.policies.ISRoleSourceDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.InstanceSpecificationRoleDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 SourceISLinkLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart

-{

-

-	/**

-	 * @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

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SourceISLinkLabelEditPart.VISUAL_ID), new Point(0, 20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public SourceISLinkLabelEditPart(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(InstanceSpecificationRoleDisplayEditPolicy.INSTANCE_SPECIFICATION_ROLE_DISPLAY, new ISRoleSourceDisplayEditPolicy());

-	}

-

-	/**

-	 * @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.InstanceSpecification_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SourceISLinkLabelEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionEditPart.java
deleted file mode 100644
index c8a51a2e5f8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionEditPart.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomSubstitutionItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SubstitutionItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

-

-/**

- * @generated

- */

-public class SubstitutionEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4004;

-

-	/**

-	 * @generated

-	 */

-	public SubstitutionEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SubstitutionItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomSubstitutionItemSemanticEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AppliedStereotypeSubstitutionEditPart) {

-			((AppliedStereotypeSubstitutionEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

-			return true;

-		}

-		if (childEditPart instanceof SubstitutionNameEditPart) {

-			((SubstitutionNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

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

-			return true;

-		}

-		if (childEditPart instanceof SubstitutionNameEditPart) {

-			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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionNameEditPart.java
deleted file mode 100644
index 1cfb8ea9b4c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionNameEditPart.java
+++ /dev/null
@@ -1,788 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 6011;

-

-	/**

-	 * @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.clazz.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_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TargetISLinkLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TargetISLinkLabelEditPart.java
deleted file mode 100644
index 73969e4ec77..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TargetISLinkLabelEditPart.java
+++ /dev/null
@@ -1,783 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.custom.policies.ISRoleTargetDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.InstanceSpecificationRoleDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 TargetISLinkLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart

-{

-

-	/**

-	 * @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

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TargetISLinkLabelEditPart.VISUAL_ID), new Point(0, 20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public TargetISLinkLabelEditPart(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(InstanceSpecificationRoleDisplayEditPolicy.INSTANCE_SPECIFICATION_ROLE_DISPLAY, new ISRoleTargetDisplayEditPolicy());

-	}

-

-	/**

-	 * @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.InstanceSpecification_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TargetISLinkLabelEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateBindingEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateBindingEditPart.java
deleted file mode 100644
index e1c94fc87a1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateBindingEditPart.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateBindingFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.TemplateBindingItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-

-/**

- * @generated

- */

-public class TemplateBindingEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4015;

-

-	/**

-	 * @generated

-	 */

-	public TemplateBindingEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TemplateBindingItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof BindingSubstitutionEditPart) {

-			((BindingSubstitutionEditPart) childEditPart).setLabel(

-					getPrimaryShape().getBindingSubstitutionFigure());

-			return true;

-		}

-		if (childEditPart instanceof AppliedStereotypeTemplateBindingEditPart) {

-			((AppliedStereotypeTemplateBindingEditPart) 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 BindingSubstitutionEditPart) {

-			return true;

-		}

-		if (childEditPart instanceof AppliedStereotypeTemplateBindingEditPart) {

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

-	}

-

-	/**

-	 * @generated

-	 */

-	public TemplateBindingFigure getPrimaryShape() {

-		return (TemplateBindingFigure) getFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateParameterEditPart.java
deleted file mode 100644
index 44f16d7bd4b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateParameterEditPart.java
+++ /dev/null
@@ -1,823 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.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.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.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractTemplateParameterEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateParameterFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.TemplateParameterItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 TemplateParameterEditPart extends

-		AbstractTemplateParameterEditPart

-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3016;

-

-	/**

-	 * @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 TemplateParameterEditPart(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 TemplateParameterItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(TemplateParamaterDisplayEditPolicy.TEMPLATE_PARAMETER_DISPLAY, new TemplateParamaterDisplayEditPolicy());

-	}

-

-	/**

-	 * @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.TemplateParameter_3016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateParameterEditPart.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 (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 TemplateParameterFigure();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureEditPart.java
deleted file mode 100644
index befdb118699..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureEditPart.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.StackLayout;

-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.editparts.ShapeNodeEditPart;

-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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomRedefinableTemplateSignatureItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.TemplateSignatureItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class TemplateSignatureEditPart extends ShapeNodeEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 3033;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure contentPane;

-

-	/**

-	 * @generated

-	 */

-	protected IFigure primaryShape;

-

-	/**

-	 * @generated

-	 */

-	public TemplateSignatureEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, getPrimaryDragEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TemplateSignatureItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomRedefinableTemplateSignatureItemSemanticEditPolicy());

-		// 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 TemplateFigure();

-	}

-

-	/**

-	 * org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateFigure

-	 * @generated

-	 */

-	public TemplateFigure getPrimaryShape() {

-		return (TemplateFigure) primaryShape;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-

-		if (childEditPart instanceof TemplateSignatureTemplateParameterCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getTemplateParameterRectangle();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

-			pane.add(((TemplateSignatureTemplateParameterCompartmentEditPart) childEditPart).getFigure());

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof TemplateSignatureTemplateParameterCompartmentEditPart) {

-			IFigure pane = getPrimaryShape().getTemplateParameterRectangle();

-			pane.remove(((TemplateSignatureTemplateParameterCompartmentEditPart) 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 TemplateSignatureTemplateParameterCompartmentEditPart) {

-			return getPrimaryShape().getTemplateParameterRectangle();

-		}

-		return getContentPane();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NodeFigure createNodePlate() {

-		String prefElementId = "TemplateSignature";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

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

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineWidth(width);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLineType(int style) {

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).setLineStyle(style);

-		}

-	}

-

-	/**

-	 * @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.ClassifierTemplateParameter_3031) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.OperationTemplateParameter_3035) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID));

-			}

-			if (type == UMLElementTypes.TemplateParameter_3016) {

-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID));

-			}

-		}

-		return super.getTargetEditPart(request);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureTemplateParameterCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureTemplateParameterCompartmentEditPart.java
deleted file mode 100644
index e6ecd117b11..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureTemplateParameterCompartmentEditPart.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.GraphicalEditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;

-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.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.notation.NotationPackage;

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

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.TemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

-

-/**

- * @generated

- */

-public class TemplateSignatureTemplateParameterCompartmentEditPart

-		extends ListCompartmentEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7038;

-

-	/**

-	 * @generated

-	 */

-	public TemplateSignatureTemplateParameterCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.TemplateSignatureTemplateParameterCompartmentEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.TemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy());

-

-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @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.ClassifierTemplateParameter_3031) {

-				return this;

-			}

-			if (type == UMLElementTypes.OperationTemplateParameter_3035) {

-				return this;

-			}

-			if (type == UMLElementTypes.TemplateParameter_3016) {

-				return this;

-			}

-			return getParent().getTargetEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java
deleted file mode 100644
index bc182fd02b0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TimeObservationNodeFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ObservationLayoutEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomTimeObservationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.TimeObservationItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-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.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * @generated

- */

-public class TimeObservationEditPart extends AbstractObservationEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 2096;

-

-	/**

-	 * @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(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ObservationLayoutEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomTimeObservationItemSemanticEditPolicy());

-		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.clazz.custom.figure.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() {

-		String prefElementId = "TimeObservation";

-		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

-

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

-		if (primaryShape instanceof NodeFigure) {

-			((NodeFigure) primaryShape).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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationNameEditPart.java
deleted file mode 100644
index 5be41de5a06..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationNameEditPart.java
+++ /dev/null
@@ -1,812 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 5153;

-

-	/**

-	 * @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.clazz.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_2096, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationStereotypeLabelEditPart.java
deleted file mode 100644
index 0d29056229d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationStereotypeLabelEditPart.java
+++ /dev/null
@@ -1,817 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 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

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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_2096, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UMLEditPartFactory.java
deleted file mode 100644
index 83a847e4491..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UMLEditPartFactory.java
+++ /dev/null
@@ -1,754 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;

-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 ModelEditPart.VISUAL_ID:

-				return new ModelEditPart(view);

-

-			case DependencyNodeEditPart.VISUAL_ID:

-				return new DependencyNodeEditPart(view);

-

-			case MultiDependencyLabelEditPart.VISUAL_ID:

-				return new MultiDependencyLabelEditPart(view);

-

-			case AssociationClassEditPart.VISUAL_ID:

-				return new AssociationClassEditPart(view);

-

-			case AssociationClassNameEditPart.VISUAL_ID:

-				return new AssociationClassNameEditPart(view);

-

-			case AssociationNodeEditPart.VISUAL_ID:

-				return new AssociationNodeEditPart(view);

-

-			case InstanceSpecificationEditPart.VISUAL_ID:

-				return new InstanceSpecificationEditPart(view);

-

-			case InstanceSpecificationNameEditPart.VISUAL_ID:

-				return new InstanceSpecificationNameEditPart(view);

-

-			case ComponentEditPart.VISUAL_ID:

-				return new ComponentEditPart(view);

-

-			case ComponentNameEditPart.VISUAL_ID:

-				return new ComponentNameEditPart(view);

-

-			case SignalEditPart.VISUAL_ID:

-				return new SignalEditPart(view);

-

-			case SignalNameEditPart.VISUAL_ID:

-				return new SignalNameEditPart(view);

-

-			case InterfaceEditPart.VISUAL_ID:

-				return new InterfaceEditPart(view);

-

-			case InterfaceNameEditPart.VISUAL_ID:

-				return new InterfaceNameEditPart(view);

-

-			case ModelEditPartTN.VISUAL_ID:

-				return new ModelEditPartTN(view);

-

-			case ModelNameEditPartTN.VISUAL_ID:

-				return new ModelNameEditPartTN(view);

-

-			case EnumerationEditPart.VISUAL_ID:

-				return new EnumerationEditPart(view);

-

-			case EnumerationNameEditPart.VISUAL_ID:

-				return new EnumerationNameEditPart(view);

-

-			case PackageEditPart.VISUAL_ID:

-				return new PackageEditPart(view);

-

-			case PackageNameEditPart.VISUAL_ID:

-				return new PackageNameEditPart(view);

-

-			case InformationItemEditPart.VISUAL_ID:

-				return new InformationItemEditPart(view);

-

-			case InformationItemNameEditPart.VISUAL_ID:

-				return new InformationItemNameEditPart(view);

-

-			case ClassEditPart.VISUAL_ID:

-				return new ClassEditPart(view);

-

-			case ClassNameEditPart.VISUAL_ID:

-				return new ClassNameEditPart(view);

-

-			case PrimitiveTypeEditPart.VISUAL_ID:

-				return new PrimitiveTypeEditPart(view);

-

-			case PrimitiveTypeNameEditPart.VISUAL_ID:

-				return new PrimitiveTypeNameEditPart(view);

-

-			case DataTypeEditPart.VISUAL_ID:

-				return new DataTypeEditPart(view);

-

-			case DataTypeNameEditPart.VISUAL_ID:

-				return new DataTypeNameEditPart(view);

-

-			case ConstraintEditPart.VISUAL_ID:

-				return new ConstraintEditPart(view);

-

-			case ConstraintNameEditPart.VISUAL_ID:

-				return new ConstraintNameEditPart(view);

-

-			case ConstraintBodyEditPart.VISUAL_ID:

-				return new ConstraintBodyEditPart(view);

-

-			case CommentEditPart.VISUAL_ID:

-				return new CommentEditPart(view);

-

-			case CommentBodyEditPart.VISUAL_ID:

-				return new CommentBodyEditPart(view);

-

-			case ShortCutDiagramEditPart.VISUAL_ID:

-				return new ShortCutDiagramEditPart(view);

-

-			case DiagramNameEditPart.VISUAL_ID:

-				return new DiagramNameEditPart(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 DefaultNamedElementEditPart.VISUAL_ID:

-				return new DefaultNamedElementEditPart(view);

-

-			case DefaultNamedElementNameEditPart.VISUAL_ID:

-				return new DefaultNamedElementNameEditPart(view);

-

-			case PropertyForClassEditPart.VISUAL_ID:

-				return new PropertyForClassEditPart(view);

-

-			case PropertyForComponentEditPart.VISUAL_ID:

-				return new PropertyForComponentEditPart(view);

-

-			case PropertyForSignalEditPart.VISUAL_ID:

-				return new PropertyForSignalEditPart(view);

-

-			case PropertyForInterfaceEditPart.VISUAL_ID:

-				return new PropertyForInterfaceEditPart(view);

-

-			case PropertyforPrimitiveTypeEditPart.VISUAL_ID:

-				return new PropertyforPrimitiveTypeEditPart(view);

-

-			case PropertyforDataTypeEditPart.VISUAL_ID:

-				return new PropertyforDataTypeEditPart(view);

-

-			case NestedClassForClassEditPart.VISUAL_ID:

-				return new NestedClassForClassEditPart(view);

-

-			case NestedClassForComponentEditPart.VISUAL_ID:

-				return new NestedClassForComponentEditPart(view);

-

-			case NestedClassForInterfaceEditPart.VISUAL_ID:

-				return new NestedClassForInterfaceEditPart(view);

-

-			case OperationForClassEditPart.VISUAL_ID:

-				return new OperationForClassEditPart(view);

-

-			case OperationForComponentEditPart.VISUAL_ID:

-				return new OperationForComponentEditPart(view);

-

-			case OperationForInterfaceEditpart.VISUAL_ID:

-				return new OperationForInterfaceEditpart(view);

-

-			case OperationForPrimitiveTypeEditPart.VISUAL_ID:

-				return new OperationForPrimitiveTypeEditPart(view);

-

-			case OperationForDataTypeEditPart.VISUAL_ID:

-				return new OperationForDataTypeEditPart(view);

-

-			case ConnectableElementTemplateParameterEditPart.VISUAL_ID:

-				return new ConnectableElementTemplateParameterEditPart(view);

-

-			case OperationTemplateParameterEditPart.VISUAL_ID:

-				return new OperationTemplateParameterEditPart(view);

-

-			case ClassifierTemplateParameterEditPart.VISUAL_ID:

-				return new ClassifierTemplateParameterEditPart(view);

-

-			case TemplateParameterEditPart.VISUAL_ID:

-				return new TemplateParameterEditPart(view);

-

-			case EnumerationLiteralEditPart.VISUAL_ID:

-				return new EnumerationLiteralEditPart(view);

-

-			case ReceptionEditPart.VISUAL_ID:

-				return new ReceptionEditPart(view);

-

-			case ReceptionInInterfaceEditPart.VISUAL_ID:

-				return new ReceptionInInterfaceEditPart(view);

-

-			case SlotEditPart.VISUAL_ID:

-				return new SlotEditPart(view);

-

-			case RedefinableTemplateSignatureEditPart.VISUAL_ID:

-				return new RedefinableTemplateSignatureEditPart(view);

-

-			case ContainmentCircleEditPart.VISUAL_ID:

-				return new ContainmentCircleEditPart(view);

-

-			case TemplateSignatureEditPart.VISUAL_ID:

-				return new TemplateSignatureEditPart(view);

-

-			case InstanceSpecificationEditPartCN.VISUAL_ID:

-				return new InstanceSpecificationEditPartCN(view);

-

-			case InstanceSpecificationNameEditPartCN.VISUAL_ID:

-				return new InstanceSpecificationNameEditPartCN(view);

-

-			case ComponentEditPartCN.VISUAL_ID:

-				return new ComponentEditPartCN(view);

-

-			case ComponentNameEditPartCN.VISUAL_ID:

-				return new ComponentNameEditPartCN(view);

-

-			case SignalEditPartCN.VISUAL_ID:

-				return new SignalEditPartCN(view);

-

-			case SignalNameEditPartCN.VISUAL_ID:

-				return new SignalNameEditPartCN(view);

-

-			case InterfaceEditPartCN.VISUAL_ID:

-				return new InterfaceEditPartCN(view);

-

-			case InterfaceNameEditPartCN.VISUAL_ID:

-				return new InterfaceNameEditPartCN(view);

-

-			case ModelEditPartCN.VISUAL_ID:

-				return new ModelEditPartCN(view);

-

-			case ModelNameEditPartCN.VISUAL_ID:

-				return new ModelNameEditPartCN(view);

-

-			case EnumerationEditPartCN.VISUAL_ID:

-				return new EnumerationEditPartCN(view);

-

-			case EnumerationNameEditPartCN.VISUAL_ID:

-				return new EnumerationNameEditPartCN(view);

-

-			case PackageEditPartCN.VISUAL_ID:

-				return new PackageEditPartCN(view);

-

-			case PackageNameEditPartCN.VISUAL_ID:

-				return new PackageNameEditPartCN(view);

-

-			case InformationItemEditPartCN.VISUAL_ID:

-				return new InformationItemEditPartCN(view);

-

-			case InformationItemNameEditPartCN.VISUAL_ID:

-				return new InformationItemNameEditPartCN(view);

-

-			case ClassEditPartCN.VISUAL_ID:

-				return new ClassEditPartCN(view);

-

-			case ClassNameEditPartCN.VISUAL_ID:

-				return new ClassNameEditPartCN(view);

-

-			case PrimitiveTypeEditPartCN.VISUAL_ID:

-				return new PrimitiveTypeEditPartCN(view);

-

-			case PrimitiveTypeNameEditPartCN.VISUAL_ID:

-				return new PrimitiveTypeNameEditPartCN(view);

-

-			case DataTypeEditPartCN.VISUAL_ID:

-				return new DataTypeEditPartCN(view);

-

-			case DataTypeNameEditPartCN.VISUAL_ID:

-				return new DataTypeNameEditPartCN(view);

-

-			case CommentEditPartCN.VISUAL_ID:

-				return new CommentEditPartCN(view);

-

-			case CommentBodyEditPartCN.VISUAL_ID:

-				return new CommentBodyEditPartCN(view);

-

-			case ConstraintEditPartCN.VISUAL_ID:

-				return new ConstraintEditPartCN(view);

-

-			case ConstraintNameEditPartCN.VISUAL_ID:

-				return new ConstraintNameEditPartCN(view);

-

-			case ConstraintBodyEditPartCN.VISUAL_ID:

-				return new ConstraintBodyEditPartCN(view);

-

-			case NestedInterfaceForClassEditPart.VISUAL_ID:

-				return new NestedInterfaceForClassEditPart(view);

-

-			case NestedInterfaceForComponentEditPart.VISUAL_ID:

-				return new NestedInterfaceForComponentEditPart(view);

-

-			case NestedInterfaceForInterfaceEditPart.VISUAL_ID:

-				return new NestedInterfaceForInterfaceEditPart(view);

-

-			case NestedEnumerationForClassEditPart.VISUAL_ID:

-				return new NestedEnumerationForClassEditPart(view);

-

-			case NestedEnumerationForComponentEditPart.VISUAL_ID:

-				return new NestedEnumerationForComponentEditPart(view);

-

-			case NestedEnumerationForInterfaceEditPart.VISUAL_ID:

-				return new NestedEnumerationForInterfaceEditPart(view);

-

-			case NestedPrimitiveTypeForClassEditPart.VISUAL_ID:

-				return new NestedPrimitiveTypeForClassEditPart(view);

-

-			case NestedPrimitiveTypeForComponentEditPart.VISUAL_ID:

-				return new NestedPrimitiveTypeForComponentEditPart(view);

-

-			case NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID:

-				return new NestedPrimitiveTypeForInterfaceEditPart(view);

-

-			case NestedDataTypeForClassEditPart.VISUAL_ID:

-				return new NestedDataTypeForClassEditPart(view);

-

-			case NestedDataTypeForComponentEditPart.VISUAL_ID:

-				return new NestedDataTypeForComponentEditPart(view);

-

-			case NestedDataTypeForInterfaceEditPart.VISUAL_ID:

-				return new NestedDataTypeForInterfaceEditPart(view);

-

-			case NestedSignalForClassEditPart.VISUAL_ID:

-				return new NestedSignalForClassEditPart(view);

-

-			case NestedSignalForComponentEditPart.VISUAL_ID:

-				return new NestedSignalForComponentEditPart(view);

-

-			case NestedSignalForInterfaceEditPart.VISUAL_ID:

-				return new NestedSignalForInterfaceEditPart(view);

-

-			case ClassAttributeCompartmentEditPartCN.VISUAL_ID:

-				return new ClassAttributeCompartmentEditPartCN(view);

-

-			case ClassOperationCompartmentEditPartCN.VISUAL_ID:

-				return new ClassOperationCompartmentEditPartCN(view);

-

-			case ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-				return new ClassNestedClassifierCompartmentEditPartCN(view);

-

-			case ComponentAttributeCompartmentEditPartCN.VISUAL_ID:

-				return new ComponentAttributeCompartmentEditPartCN(view);

-

-			case ComponentOperationCompartmentEditPartCN.VISUAL_ID:

-				return new ComponentOperationCompartmentEditPartCN(view);

-

-			case ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-				return new ComponentNestedClassifierCompartmentEditPartCN(view);

-

-			case SignalAttributeCompartmentEditPartCN.VISUAL_ID:

-				return new SignalAttributeCompartmentEditPartCN(view);

-

-			case InterfaceAttributeCompartmentEditPartCN.VISUAL_ID:

-				return new InterfaceAttributeCompartmentEditPartCN(view);

-

-			case InterfaceOperationCompartmentEditPartCN.VISUAL_ID:

-				return new InterfaceOperationCompartmentEditPartCN(view);

-

-			case InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-				return new InterfaceNestedClassifierCompartmentEditPartCN(view);

-

-			case PrimitiveTypeAttributeCompartmentEditPartCN.VISUAL_ID:

-				return new PrimitiveTypeAttributeCompartmentEditPartCN(view);

-

-			case PrimitiveTypeOperationCompartmentEditPartCN.VISUAL_ID:

-				return new PrimitiveTypeOperationCompartmentEditPartCN(view);

-

-			case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

-				return new DataTypeAttributeCompartmentEditPartCN(view);

-

-			case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:

-				return new DataTypeOperationCompartmentEditPartCN(view);

-

-			case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID:

-				return new ModelPackageableElementCompartmentEditPartCN(view);

-

-			case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID:

-				return new PackagePackageableElementCompartmentEditPartCN(view);

-

-			case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:

-				return new EnumerationEnumerationLiteralCompartmentEditPartCN(view);

-

-			case InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID:

-				return new InstanceSpecificationSlotCompartmentEditPartCN(view);

-

-			case ClassAttributeCompartmentEditPart.VISUAL_ID:

-				return new ClassAttributeCompartmentEditPart(view);

-

-			case ClassOperationCompartmentEditPart.VISUAL_ID:

-				return new ClassOperationCompartmentEditPart(view);

-

-			case ClassNestedClassifierCompartmentEditPart.VISUAL_ID:

-				return new ClassNestedClassifierCompartmentEditPart(view);

-

-			case ComponentAttributeCompartmentEditPart.VISUAL_ID:

-				return new ComponentAttributeCompartmentEditPart(view);

-

-			case ComponentOperationCompartmentEditPart.VISUAL_ID:

-				return new ComponentOperationCompartmentEditPart(view);

-

-			case ComponentNestedClassifierCompartmentEditPart.VISUAL_ID:

-				return new ComponentNestedClassifierCompartmentEditPart(view);

-

-			case InterfaceAttributeCompartmentEditPart.VISUAL_ID:

-				return new InterfaceAttributeCompartmentEditPart(view);

-

-			case InterfaceOperationCompartmentEditPart.VISUAL_ID:

-				return new InterfaceOperationCompartmentEditPart(view);

-

-			case InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID:

-				return new InterfaceNestedClassifierCompartmentEditPart(view);

-

-			case PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID:

-				return new PrimitiveTypeAttributeCompartmentEditPart(view);

-

-			case PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID:

-				return new PrimitiveTypeOperationCompartmentEditPart(view);

-

-			case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

-				return new DataTypeAttributeCompartmentEditPart(view);

-

-			case DataTypeOperationCompartmentEditPart.VISUAL_ID:

-				return new DataTypeOperationCompartmentEditPart(view);

-

-			case AssociationClassAttributeCompartmentEditPart.VISUAL_ID:

-				return new AssociationClassAttributeCompartmentEditPart(view);

-

-			case InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID:

-				return new InstanceSpecificationSlotCompartmentEditPart(view);

-

-			case SignalAttributeCompartmentEditPart.VISUAL_ID:

-				return new SignalAttributeCompartmentEditPart(view);

-

-			case ModelPackageableElementCompartmentEditPartTN.VISUAL_ID:

-				return new ModelPackageableElementCompartmentEditPartTN(view);

-

-			case PackagePackageableElementCompartmentEditPart.VISUAL_ID:

-				return new PackagePackageableElementCompartmentEditPart(view);

-

-			case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:

-				return new EnumerationEnumerationLiteralCompartmentEditPart(view);

-

-			case AssociationClassOperationCompartmentEditPart.VISUAL_ID:

-				return new AssociationClassOperationCompartmentEditPart(view);

-

-			case AssociationClassNestedClassifierCompartmentEditPart.VISUAL_ID:

-				return new AssociationClassNestedClassifierCompartmentEditPart(view);

-

-			case RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID:

-				return new RedefinableTemplateSignatureTemplateParameterCompartmentEditPart(view);

-

-			case TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID:

-				return new TemplateSignatureTemplateParameterCompartmentEditPart(view);

-

-			case AssociationClassDashedLinkEditPart.VISUAL_ID:

-				return new AssociationClassDashedLinkEditPart(view);

-

-			case AssociationClassLinkEditPart.VISUAL_ID:

-				return new AssociationClassLinkEditPart(view);

-

-			case AssociationClassRoleSourceEditPart.VISUAL_ID:

-				return new AssociationClassRoleSourceEditPart(view);

-

-			case AssociationClassRoleTargetEditPart.VISUAL_ID:

-				return new AssociationClassRoleTargetEditPart(view);

-

-			case AssociationEditPart.VISUAL_ID:

-				return new AssociationEditPart(view);

-

-			case AppliedStereotypeAssociationEditPart.VISUAL_ID:

-				return new AppliedStereotypeAssociationEditPart(view);

-

-			case AssociationNameEditPart.VISUAL_ID:

-				return new AssociationNameEditPart(view);

-

-			case AssociationTargetNameEditPart.VISUAL_ID:

-				return new AssociationTargetNameEditPart(view);

-

-			case AssociationSourceNameEditPart.VISUAL_ID:

-				return new AssociationSourceNameEditPart(view);

-

-			case AssociationMultiplicitySourceEditPart.VISUAL_ID:

-				return new AssociationMultiplicitySourceEditPart(view);

-

-			case AssociationMultiplicityTargetEditPart.VISUAL_ID:

-				return new AssociationMultiplicityTargetEditPart(view);

-

-			case AssociationBranchEditPart.VISUAL_ID:

-				return new AssociationBranchEditPart(view);

-

-			case AssociationBranchRoleEditPart.VISUAL_ID:

-				return new AssociationBranchRoleEditPart(view);

-

-			case AssociationBranchMutliplicityEditPart.VISUAL_ID:

-				return new AssociationBranchMutliplicityEditPart(view);

-

-			case GeneralizationEditPart.VISUAL_ID:

-				return new GeneralizationEditPart(view);

-

-			case AppliedStereotyperGeneralizationEditPart.VISUAL_ID:

-				return new AppliedStereotyperGeneralizationEditPart(view);

-

-			case InterfaceRealizationEditPart.VISUAL_ID:

-				return new InterfaceRealizationEditPart(view);

-

-			case AppliedStereotypeInterfaceRealizationEditPart.VISUAL_ID:

-				return new AppliedStereotypeInterfaceRealizationEditPart(view);

-

-			case InterfaceRealizationNameEditPart.VISUAL_ID:

-				return new InterfaceRealizationNameEditPart(view);

-

-			case SubstitutionEditPart.VISUAL_ID:

-				return new SubstitutionEditPart(view);

-

-			case AppliedStereotypeSubstitutionEditPart.VISUAL_ID:

-				return new AppliedStereotypeSubstitutionEditPart(view);

-

-			case SubstitutionNameEditPart.VISUAL_ID:

-				return new SubstitutionNameEditPart(view);

-

-			case RealizationEditPart.VISUAL_ID:

-				return new RealizationEditPart(view);

-

-			case AppliedStereotypeRealizationEditPart.VISUAL_ID:

-				return new AppliedStereotypeRealizationEditPart(view);

-

-			case RealizationNameEditPart.VISUAL_ID:

-				return new RealizationNameEditPart(view);

-

-			case AbstractionEditPart.VISUAL_ID:

-				return new AbstractionEditPart(view);

-

-			case AbstractionNameEditPart.VISUAL_ID:

-				return new AbstractionNameEditPart(view);

-

-			case AppliedStereotypeAbstractionEditPart.VISUAL_ID:

-				return new AppliedStereotypeAbstractionEditPart(view);

-

-			case UsageEditPart.VISUAL_ID:

-				return new UsageEditPart(view);

-

-			case UsageNameEditPart.VISUAL_ID:

-				return new UsageNameEditPart(view);

-

-			case AppliedStereotypeUsageEditPart.VISUAL_ID:

-				return new AppliedStereotypeUsageEditPart(view);

-

-			case DependencyEditPart.VISUAL_ID:

-				return new DependencyEditPart(view);

-

-			case DependencyNameEditPart.VISUAL_ID:

-				return new DependencyNameEditPart(view);

-

-			case AppliedStereotypeDependencyEditPart.VISUAL_ID:

-				return new AppliedStereotypeDependencyEditPart(view);

-

-			case DependencyBranchEditPart.VISUAL_ID:

-				return new DependencyBranchEditPart(view);

-

-			case ElementImportEditPart.VISUAL_ID:

-				return new ElementImportEditPart(view);

-

-			case ElementImportAliasEditPart.VISUAL_ID:

-				return new ElementImportAliasEditPart(view);

-

-			case AppliedStereotypeElementImportEditPart.VISUAL_ID:

-				return new AppliedStereotypeElementImportEditPart(view);

-

-			case PackageImportEditPart.VISUAL_ID:

-				return new PackageImportEditPart(view);

-

-			case AppliedStereotypePackageImportEditPart.VISUAL_ID:

-				return new AppliedStereotypePackageImportEditPart(view);

-

-			case PackageMergeEditPart.VISUAL_ID:

-				return new PackageMergeEditPart(view);

-

-			case AppliedStereotypePackageMergeEditPart.VISUAL_ID:

-				return new AppliedStereotypePackageMergeEditPart(view);

-

-			case ProfileApplicationEditPart.VISUAL_ID:

-				return new ProfileApplicationEditPart(view);

-

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-				return new CommentAnnotatedElementEditPart(view);

-

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-				return new ConstraintConstrainedElementEditPart(view);

-

-			case TemplateBindingEditPart.VISUAL_ID:

-				return new TemplateBindingEditPart(view);

-

-			case BindingSubstitutionEditPart.VISUAL_ID:

-				return new BindingSubstitutionEditPart(view);

-

-			case AppliedStereotypeTemplateBindingEditPart.VISUAL_ID:

-				return new AppliedStereotypeTemplateBindingEditPart(view);

-

-			case GeneralizationSetEditPart.VISUAL_ID:

-				return new GeneralizationSetEditPart(view);

-

-			case ConstraintLabelEditPart.VISUAL_ID:

-				return new ConstraintLabelEditPart(view);

-

-			case AppliedStereotypeGeneralizationSetLabelEditPart.VISUAL_ID:

-				return new AppliedStereotypeGeneralizationSetLabelEditPart(view);

-

-			case InstanceSpecificationLinkEditPart.VISUAL_ID:

-				return new InstanceSpecificationLinkEditPart(view);

-

-			case SourceISLinkLabelEditPart.VISUAL_ID:

-				return new SourceISLinkLabelEditPart(view);

-

-			case TargetISLinkLabelEditPart.VISUAL_ID:

-				return new TargetISLinkLabelEditPart(view);

-

-			case ContainmentSubLinkEditPart.VISUAL_ID:

-				return new ContainmentSubLinkEditPart(view);

-

-			case ContainmentLinkEditPart.VISUAL_ID:

-				return new ContainmentLinkEditPart(view);

-

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-				return new ConnectorTimeObservationEditPart(view);

-

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				return new ConnectorDurationObservationEditPart(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);

-

-			case ContextLinkEditPart.VISUAL_ID:

-				return new ContextLinkEditPart(view);

-

-			case ContextLinkAppliedStereotypeEditPart.VISUAL_ID:

-				return new ContextLinkAppliedStereotypeEditPart(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageEditPart.java
deleted file mode 100644
index de1ba7efbca..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageEditPart.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.gef.EditPart;

-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.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomUsageItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UsageItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

-

-/**

- * @generated

- */

-public class UsageEditPart extends UMLConnectionNodeEditPart

-		implements ITreeBranchEditPart

-{

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 4007;

-

-	/**

-	 * @generated

-	 */

-	public UsageEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new UsageItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeUsageLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomUsageItemSemanticEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof UsageNameEditPart) {

-			((UsageNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

-			return true;

-		}

-		if (childEditPart instanceof AppliedStereotypeUsageEditPart) {

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

-			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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageNameEditPart.java
deleted file mode 100644
index b3643562214..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageNameEditPart.java
+++ /dev/null
@@ -1,788 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

-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.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 = 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.clazz.edit.parts.UsageNameEditPart.VISUAL_ID), new Point(0, 40));

-	}

-

-	/**

-	 * @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_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AbstractionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AbstractionItemSemanticEditPolicy.java
deleted file mode 100644
index 1793aeda141..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AbstractionItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class AbstractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public AbstractionItemSemanticEditPolicy() {

-		super(UMLElementTypes.Abstraction_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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationBranchItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationBranchItemSemanticEditPolicy.java
deleted file mode 100644
index 3a7b8cf80bc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationBranchItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class AssociationBranchItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public AssociationBranchItemSemanticEditPolicy() {

-		super(UMLElementTypes.Association_4019);

-	}

-

-	/**

-	 * @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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 668177fa887..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class AssociationClassAttributeCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getAssociationClassAttributes_7034SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PropertyForComponentEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getAssociationClassAttributes_7034SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 5756d2bc735..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class AssociationClassAttributeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassAttributeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.AssociationClass_2013);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Property_3002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PropertyForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassItemSemanticEditPolicy.java
deleted file mode 100644
index c798ad6b0b7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,503 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class AssociationClassItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassItemSemanticEditPolicy() {

-		super(UMLElementTypes.AssociationClass_2013);

-	}

-

-	/**

-	 * @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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case InterfaceRealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new InterfaceRealizationReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassLinkItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassLinkItemSemanticEditPolicy.java
deleted file mode 100644
index cfe20259cc8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassLinkItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,503 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class AssociationClassLinkItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassLinkItemSemanticEditPolicy() {

-		super(UMLElementTypes.AssociationClass_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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case InterfaceRealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new InterfaceRealizationReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 835f7f81510..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class AssociationClassNestedClassifierCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getClass_NestedClassifier();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getAssociationClassNestedclassifiers_7037SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return NestedClassForComponentEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getAssociationClassNestedclassifiers_7037SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 067ddb03c58..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedClassForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class AssociationClassNestedClassifierCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassNestedClassifierCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.AssociationClass_2013);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Class_3004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedClassForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassOperationCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index e0e74dbfb7e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassOperationCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class AssociationClassOperationCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getClass_OwnedOperation();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getAssociationClassOperations_7036SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return OperationForComponentEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getAssociationClassOperations_7036SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassOperationCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 44402278985..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassOperationCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class AssociationClassOperationCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public AssociationClassOperationCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.AssociationClass_2013);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Operation_3003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new OperationForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationItemSemanticEditPolicy.java
deleted file mode 100644
index b46537629ac..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class AssociationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public AssociationItemSemanticEditPolicy() {

-		super(UMLElementTypes.Association_4001);

-	}

-

-	/**

-	 * @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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationNodeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationNodeItemSemanticEditPolicy.java
deleted file mode 100644
index 6a51334cdd6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationNodeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class AssociationNodeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public AssociationNodeItemSemanticEditPolicy() {

-		super(UMLElementTypes.Association_2015);

-	}

-

-	/**

-	 * @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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index f8cc632c50c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ClassAttributeCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassAttributes_7017SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PropertyForClassEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getClassAttributes_7017SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index 116d1233341..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ClassAttributeCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassAttributes_7011SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PropertyForClassEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getClassAttributes_7011SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 454908b484d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ClassAttributeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ClassAttributeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Class_2008);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Property_3012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PropertyForClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index e15558ed984..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ClassAttributeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ClassAttributeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Class_3010);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Property_3012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PropertyForClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassCanonicalEditPolicy.java
deleted file mode 100644
index 570699fb985..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ClassCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateableElement_OwnedTemplateSignature();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClass_2008SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return RedefinableTemplateSignatureEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getClass_2008SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassCanonicalEditPolicyCN.java
deleted file mode 100644
index 8d05dc3a5e1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ClassCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateableElement_OwnedTemplateSignature();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClass_3010SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return RedefinableTemplateSignatureEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getClass_3010SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassItemSemanticEditPolicy.java
deleted file mode 100644
index e9779965aee..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,537 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ClassItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ClassItemSemanticEditPolicy() {

-		super(UMLElementTypes.Class_2008);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.RedefinableTemplateSignature_3015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RedefinableTemplateSignatureCreateCommand(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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case InterfaceRealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new InterfaceRealizationReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassItemSemanticEditPolicyCN.java
deleted file mode 100644
index 1dc5a26c501..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,537 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ClassItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ClassItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Class_3010);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.RedefinableTemplateSignature_3015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RedefinableTemplateSignatureCreateCommand(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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case InterfaceRealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new InterfaceRealizationReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index c12a3a7ee30..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedDataTypeForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedEnumerationForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedPrimitiveTypeForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedSignalForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ClassNestedClassifierCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getClass_NestedClassifier();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassNestedclassifiers_7019SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case NestedClassForClassEditPart.VISUAL_ID:

-		case NestedInterfaceForClassEditPart.VISUAL_ID:

-		case NestedEnumerationForClassEditPart.VISUAL_ID:

-		case NestedPrimitiveTypeForClassEditPart.VISUAL_ID:

-		case NestedDataTypeForClassEditPart.VISUAL_ID:

-		case NestedSignalForClassEditPart.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getClassNestedclassifiers_7019SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index 9a511e67993..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedDataTypeForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedEnumerationForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedPrimitiveTypeForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedSignalForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ClassNestedClassifierCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getClass_NestedClassifier();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassNestedclassifiers_7013SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case NestedClassForClassEditPart.VISUAL_ID:

-		case NestedInterfaceForClassEditPart.VISUAL_ID:

-		case NestedEnumerationForClassEditPart.VISUAL_ID:

-		case NestedPrimitiveTypeForClassEditPart.VISUAL_ID:

-		case NestedDataTypeForClassEditPart.VISUAL_ID:

-		case NestedSignalForClassEditPart.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getClassNestedclassifiers_7013SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index da95a77e798..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedClassForClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedDataTypeForClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedEnumerationForClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedInterfaceForClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedPrimitiveTypeForClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedSignalForClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ClassNestedClassifierCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ClassNestedClassifierCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Class_2008);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Class_3014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedClassForClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3036 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedInterfaceForClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3052 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedEnumerationForClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3047 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedPrimitiveTypeForClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3044 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedDataTypeForClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3050 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedSignalForClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 7f428078e6e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedClassForClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedDataTypeForClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedEnumerationForClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedInterfaceForClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedPrimitiveTypeForClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedSignalForClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ClassNestedClassifierCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ClassNestedClassifierCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Class_3010);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Class_3014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedClassForClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3036 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedInterfaceForClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3052 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedEnumerationForClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3047 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedPrimitiveTypeForClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3044 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedDataTypeForClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3050 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedSignalForClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index de265169acc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ClassOperationCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getClass_OwnedReception());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getClass_OwnedOperation());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassOperations_7018SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == ReceptionEditPart.VISUAL_ID || visualID == OperationForClassEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getClassOperations_7018SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index 3f675a211b5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ClassOperationCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getClass_OwnedReception());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getClass_OwnedOperation());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassOperations_7012SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == ReceptionEditPart.VISUAL_ID || visualID == OperationForClassEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getClassOperations_7012SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 40b15f6a5b8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForClassCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ReceptionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ClassOperationCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ClassOperationCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Class_2008);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Reception_3011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ReceptionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Operation_3013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new OperationForClassCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index d45ae754fde..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForClassCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ReceptionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ClassOperationCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ClassOperationCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Class_3010);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Reception_3011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ReceptionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Operation_3013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new OperationForClassCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassifierTemplateParameterItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassifierTemplateParameterItemSemanticEditPolicy.java
deleted file mode 100644
index b5c5da8add2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassifierTemplateParameterItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ClassifierTemplateParameterItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ClassifierTemplateParameterItemSemanticEditPolicy() {

-		super(UMLElementTypes.ClassifierTemplateParameter_3031);

-	}

-

-	/**

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

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
deleted file mode 100644
index d905af35f17..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CommentAnnotatedElementItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CommentAnnotatedElementItemSemanticEditPolicy() {

-		super(UMLElementTypes.CommentAnnotatedElement_4013);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

-		return getGEFWrapper(new DestroyReferenceCommand(req));

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/CommentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/CommentItemSemanticEditPolicy.java
deleted file mode 100644
index e107d9fd31d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/CommentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

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

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CommentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CommentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Comment_2012);

-	}

-

-	/**

-	 * @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_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/CommentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/CommentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 4602b56d517..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/CommentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

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

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CommentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CommentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Comment_3028);

-	}

-

-	/**

-	 * @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_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index a44c4601161..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentAttributeCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentAttributes_7002SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PropertyForComponentEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getComponentAttributes_7002SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index 2be105ac067..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentAttributeCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentAttributes_7023SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PropertyForComponentEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getComponentAttributes_7023SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index acef1342961..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentAttributeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentAttributeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Component_2002);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Property_3002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PropertyForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 1c268f52b3f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentAttributeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentAttributeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Component_3021);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Property_3002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PropertyForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentCanonicalEditPolicy.java
deleted file mode 100644
index cf88983c73e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateableElement_OwnedTemplateSignature();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponent_2002SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return RedefinableTemplateSignatureEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getComponent_2002SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentCanonicalEditPolicyCN.java
deleted file mode 100644
index 471b388d559..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateableElement_OwnedTemplateSignature();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponent_3021SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return RedefinableTemplateSignatureEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getComponent_3021SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicy.java
deleted file mode 100644
index 50e75a112ef..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,537 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Component_2002);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.RedefinableTemplateSignature_3015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RedefinableTemplateSignatureCreateCommand(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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case InterfaceRealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new InterfaceRealizationReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 15631d96726..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,537 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Component_3021);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.RedefinableTemplateSignature_3015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RedefinableTemplateSignatureCreateCommand(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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case InterfaceRealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new InterfaceRealizationReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index ba49150e58c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedDataTypeForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedEnumerationForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedPrimitiveTypeForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedSignalForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentNestedClassifierCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getClass_NestedClassifier();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentNestedclassifiers_7004SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case NestedClassForComponentEditPart.VISUAL_ID:

-		case NestedInterfaceForComponentEditPart.VISUAL_ID:

-		case NestedEnumerationForComponentEditPart.VISUAL_ID:

-		case NestedPrimitiveTypeForComponentEditPart.VISUAL_ID:

-		case NestedDataTypeForComponentEditPart.VISUAL_ID:

-		case NestedSignalForComponentEditPart.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getComponentNestedclassifiers_7004SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index f30b6446fa5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedDataTypeForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedEnumerationForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedPrimitiveTypeForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedSignalForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentNestedClassifierCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getClass_NestedClassifier();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentNestedclassifiers_7025SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case NestedClassForComponentEditPart.VISUAL_ID:

-		case NestedInterfaceForComponentEditPart.VISUAL_ID:

-		case NestedEnumerationForComponentEditPart.VISUAL_ID:

-		case NestedPrimitiveTypeForComponentEditPart.VISUAL_ID:

-		case NestedDataTypeForComponentEditPart.VISUAL_ID:

-		case NestedSignalForComponentEditPart.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getComponentNestedclassifiers_7025SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index a95185efd4c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedClassForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedDataTypeForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedEnumerationForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedInterfaceForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedPrimitiveTypeForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedSignalForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentNestedClassifierCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentNestedClassifierCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Component_2002);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Class_3004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedClassForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3037 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedInterfaceForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3053 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedEnumerationForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3046 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedPrimitiveTypeForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3045 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedDataTypeForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3051 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedSignalForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 6183da8ca63..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedClassForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedDataTypeForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedEnumerationForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedInterfaceForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedPrimitiveTypeForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedSignalForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentNestedClassifierCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentNestedClassifierCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Component_3021);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Class_3004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedClassForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3037 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedInterfaceForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3053 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedEnumerationForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3046 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedPrimitiveTypeForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3045 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedDataTypeForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3051 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedSignalForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 40211e732e9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentOperationCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getClass_OwnedOperation());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getClass_OwnedReception());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentOperations_7003SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == OperationForComponentEditPart.VISUAL_ID || visualID == ReceptionEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getComponentOperations_7003SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index ab9b9915066..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentOperationCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getClass_OwnedOperation());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getClass_OwnedReception());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentOperations_7024SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == OperationForComponentEditPart.VISUAL_ID || visualID == ReceptionEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getComponentOperations_7024SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index bc630deb8d3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ReceptionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentOperationCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentOperationCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Component_2002);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Operation_3003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new OperationForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Reception_3011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ReceptionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 89df15eafe0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ReceptionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentOperationCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentOperationCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Component_3021);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Operation_3003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new OperationForComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Reception_3011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ReceptionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConnectableElementTemplateParameterItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConnectableElementTemplateParameterItemSemanticEditPolicy.java
deleted file mode 100644
index 2f36a1a58a3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConnectableElementTemplateParameterItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ConnectableElementTemplateParameterItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ConnectableElementTemplateParameterItemSemanticEditPolicy() {

-		super(UMLElementTypes.ConnectableElementTemplateParameter_3034);

-	}

-

-	/**

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

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConnectorDurationObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConnectorDurationObservationItemSemanticEditPolicy.java
deleted file mode 100644
index 75604c82f40..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConnectorDurationObservationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ConnectorDurationObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ConnectorDurationObservationItemSemanticEditPolicy() {

-		super(UMLElementTypes.DurationObservationEvent_4025);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

-		return getGEFWrapper(new DestroyReferenceCommand(req));

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConnectorTimeObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConnectorTimeObservationItemSemanticEditPolicy.java
deleted file mode 100644
index 928f40c3389..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConnectorTimeObservationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ConnectorTimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ConnectorTimeObservationItemSemanticEditPolicy() {

-		super(UMLElementTypes.TimeObservationEvent_4024);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

-		return getGEFWrapper(new DestroyReferenceCommand(req));

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
deleted file mode 100644
index 649aeb0fb34..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ConstraintConstrainedElementItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ConstraintConstrainedElementItemSemanticEditPolicy() {

-		super(UMLElementTypes.ConstraintConstrainedElement_4014);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

-		return getGEFWrapper(new DestroyReferenceCommand(req));

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConstraintItemSemanticEditPolicy.java
deleted file mode 100644
index 2f3bab155dc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConstraintItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ConstraintItemSemanticEditPolicy() {

-		super(UMLElementTypes.Constraint_2011);

-	}

-

-	/**

-	 * @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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			return null;

-		}

-		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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConstraintItemSemanticEditPolicyCN.java
deleted file mode 100644
index bf3c1881507..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConstraintItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

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

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ConstraintItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Constraint_3029);

-	}

-

-	/**

-	 * @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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			return null;

-		}

-		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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ContextLinkItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ContextLinkItemSemanticEditPolicy.java
deleted file mode 100644
index 42ffb52524e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ContextLinkItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ContextLinkItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ContextLinkItemSemanticEditPolicy() {

-		super(UMLElementTypes.ConstraintContext_8500);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

-		return getGEFWrapper(new DestroyReferenceCommand(req));

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index d103959c93b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DataTypeAttributeCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getDataType_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeAttributes_7020SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PropertyforDataTypeEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getDataTypeAttributes_7020SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index 79dc7bfa368..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DataTypeAttributeCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getDataType_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeAttributes_7032SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PropertyforDataTypeEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getDataTypeAttributes_7032SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 038f173a2a5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyforDataTypeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DataTypeAttributeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DataTypeAttributeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.DataType_2010);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Property_3018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PropertyforDataTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index a27c84df477..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyforDataTypeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DataTypeAttributeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DataTypeAttributeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.DataType_3027);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Property_3018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PropertyforDataTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeCanonicalEditPolicy.java
deleted file mode 100644
index 956bc74e1d7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DataTypeCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateableElement_OwnedTemplateSignature();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

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

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataType_2010SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return RedefinableTemplateSignatureEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getDataType_2010SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeCanonicalEditPolicyCN.java
deleted file mode 100644
index ea049e2dee2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DataTypeCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateableElement_OwnedTemplateSignature();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataType_3027SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return RedefinableTemplateSignatureEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getDataType_3027SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicy.java
deleted file mode 100644
index ffba5d4cdbe..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,522 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DataTypeItemSemanticEditPolicy() {

-		super(UMLElementTypes.DataType_2010);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.RedefinableTemplateSignature_3015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RedefinableTemplateSignatureCreateCommand(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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicyCN.java
deleted file mode 100644
index c7516a5bf07..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,522 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DataTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DataTypeItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.DataType_3027);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.RedefinableTemplateSignature_3015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RedefinableTemplateSignatureCreateCommand(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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 50102231af7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForDataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DataTypeOperationCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getDataType_OwnedOperation();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeOperations_7021SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return OperationForDataTypeEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getDataTypeOperations_7021SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index ad3ad273cf0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForDataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DataTypeOperationCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getDataType_OwnedOperation();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeOperations_7033SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return OperationForDataTypeEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getDataTypeOperations_7033SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index f3552072780..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForDataTypeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DataTypeOperationCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DataTypeOperationCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.DataType_2010);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Operation_3019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new OperationForDataTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index f85a088012a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForDataTypeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DataTypeOperationCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DataTypeOperationCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.DataType_3027);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Operation_3019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new OperationForDataTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
deleted file mode 100644
index 63d47089c06..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DefaultNamedElementItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DefaultNamedElementItemSemanticEditPolicy() {

-		super(UMLElementTypes.NamedElement_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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DependencyBranchSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DependencyBranchSemanticEditPolicy.java
deleted file mode 100644
index eece13d767d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DependencyBranchSemanticEditPolicy.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DependencyBranchSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DependencyBranchSemanticEditPolicy() {

-		super(UMLElementTypes.Dependency_4018);

-	}

-

-	/**

-	 * @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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DependencyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DependencyItemSemanticEditPolicy.java
deleted file mode 100644
index 66a59c664a0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DependencyItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DependencyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DependencyItemSemanticEditPolicy() {

-		super(UMLElementTypes.Dependency_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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DependencyNodeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DependencyNodeItemSemanticEditPolicy.java
deleted file mode 100644
index be83fc634e9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DependencyNodeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DependencyNodeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DependencyNodeItemSemanticEditPolicy() {

-		super(UMLElementTypes.Dependency_2014);

-	}

-

-	/**

-	 * @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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DurationObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DurationObservationItemSemanticEditPolicy.java
deleted file mode 100644
index bdb34baf7d8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DurationObservationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DurationObservationItemSemanticEditPolicy() {

-		super(UMLElementTypes.DurationObservation_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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ElementImportItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ElementImportItemSemanticEditPolicy.java
deleted file mode 100644
index f3ff8eb6afe..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ElementImportItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ElementImportItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ElementImportItemSemanticEditPolicy() {

-		super(UMLElementTypes.ElementImport_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;

-		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_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 37425996663..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationLiteralEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getEnumeration_OwnedLiteral();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getEnumerationEnumerationLiteralCompartment_7015SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return EnumerationLiteralEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getEnumerationEnumerationLiteralCompartment_7015SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index 26e793bccc8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationLiteralEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getEnumeration_OwnedLiteral();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getEnumerationEnumerationLiteralCompartment_7031SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return EnumerationLiteralEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getEnumerationEnumerationLiteralCompartment_7031SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index a3f753a2c91..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.EnumerationLiteralCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Enumeration_2006);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.EnumerationLiteral_3017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new EnumerationLiteralCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 90ca875cef0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.EnumerationLiteralCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Enumeration_3025);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.EnumerationLiteral_3017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new EnumerationLiteralCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationItemSemanticEditPolicy.java
deleted file mode 100644
index 8d121e77b33..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class EnumerationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public EnumerationItemSemanticEditPolicy() {

-		super(UMLElementTypes.Enumeration_2006);

-	}

-

-	/**

-	 * @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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationItemSemanticEditPolicyCN.java
deleted file mode 100644
index 7e3d76e85ab..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class EnumerationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public EnumerationItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Enumeration_3025);

-	}

-

-	/**

-	 * @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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationLiteralItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationLiteralItemSemanticEditPolicy.java
deleted file mode 100644
index 0aa10740a76..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationLiteralItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class EnumerationLiteralItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public EnumerationLiteralItemSemanticEditPolicy() {

-		super(UMLElementTypes.EnumerationLiteral_3017);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/GeneralizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/GeneralizationItemSemanticEditPolicy.java
deleted file mode 100644
index 0eb51e72235..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/GeneralizationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationSetCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationSetReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationSetEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class GeneralizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public GeneralizationItemSemanticEditPolicy() {

-		super(UMLElementTypes.Generalization_4002);

-	}

-

-	/**

-	 * @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_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.GeneralizationSet_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationSetCreateCommand(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_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.GeneralizationSet_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationSetCreateCommand(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 GeneralizationSetEditPart.VISUAL_ID:

-			return getGEFWrapper(new GeneralizationSetReorientCommand(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));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/GeneralizationSetItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/GeneralizationSetItemSemanticEditPolicy.java
deleted file mode 100644
index 1c644d18e93..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/GeneralizationSetItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class GeneralizationSetItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public GeneralizationSetItemSemanticEditPolicy() {

-		super(UMLElementTypes.GeneralizationSet_4020);

-	}

-

-	/**

-	 * @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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InformationFlowItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InformationFlowItemSemanticEditPolicy.java
deleted file mode 100644
index a194d66ec48..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InformationFlowItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InformationFlowItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InformationFlowItemSemanticEditPolicy() {

-		super(UMLElementTypes.InformationFlow_4026);

-	}

-

-	/**

-	 * @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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InformationItemItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InformationItemItemSemanticEditPolicy.java
deleted file mode 100644
index 8f4305c365d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InformationItemItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InformationItemItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InformationItemItemSemanticEditPolicy() {

-		super(UMLElementTypes.InformationItem_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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InformationItemItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InformationItemItemSemanticEditPolicyCN.java
deleted file mode 100644
index c5845e5c982..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InformationItemItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InformationItemItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InformationItemItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.InformationItem_3040);

-	}

-

-	/**

-	 * @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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationItemSemanticEditPolicy.java
deleted file mode 100644
index d85f10ea2c4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InstanceSpecificationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InstanceSpecificationItemSemanticEditPolicy() {

-		super(UMLElementTypes.InstanceSpecification_2001);

-	}

-

-	/**

-	 * @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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationItemSemanticEditPolicyCN.java
deleted file mode 100644
index 17bd478e763..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InstanceSpecificationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InstanceSpecificationItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.InstanceSpecification_3020);

-	}

-

-	/**

-	 * @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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationLinkItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationLinkItemSemanticEditPolicy.java
deleted file mode 100644
index fb37cda98a2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationLinkItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InstanceSpecificationLinkItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InstanceSpecificationLinkItemSemanticEditPolicy() {

-		super(UMLElementTypes.InstanceSpecification_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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 4378c6b8f6a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SlotEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InstanceSpecificationSlotCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getInstanceSpecification_Slot();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInstanceSpecificationSlots_7001SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return SlotEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getInstanceSpecificationSlots_7001SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index 40fb5269769..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SlotEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getInstanceSpecification_Slot();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInstanceSpecificationSlots_7035SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return SlotEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getInstanceSpecificationSlots_7035SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 06d10877ad9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SlotCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InstanceSpecificationSlotCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InstanceSpecificationSlotCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.InstanceSpecification_2001);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Slot_3030 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SlotCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index f1bf3051093..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SlotCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.InstanceSpecification_3020);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Slot_3030 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SlotCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 5ae91d78b99..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceAttributeCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getInterface_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceAttributes_7006SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PropertyForInterfaceEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getInterfaceAttributes_7006SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index cfabc32e392..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceAttributeCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getInterface_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceAttributes_7027SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PropertyForInterfaceEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getInterfaceAttributes_7027SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 39902ed2075..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceAttributeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceAttributeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interface_2004);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Property_3006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PropertyForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index efb7f79d5dd..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceAttributeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceAttributeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Interface_3023);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Property_3006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PropertyForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceCanonicalEditPolicy.java
deleted file mode 100644
index c467fb968fc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateableElement_OwnedTemplateSignature();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterface_2004SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return RedefinableTemplateSignatureEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getInterface_2004SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceCanonicalEditPolicyCN.java
deleted file mode 100644
index 69a5d6dfa40..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateableElement_OwnedTemplateSignature();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterface_3023SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return RedefinableTemplateSignatureEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getInterface_3023SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index 417893c966f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,537 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interface_2004);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.RedefinableTemplateSignature_3015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RedefinableTemplateSignatureCreateCommand(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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case InterfaceRealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new InterfaceRealizationReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicyCN.java
deleted file mode 100644
index 7cbf28c4bd0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,537 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Interface_3023);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.RedefinableTemplateSignature_3015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RedefinableTemplateSignatureCreateCommand(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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case InterfaceRealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new InterfaceRealizationReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 1dfeca7c1af..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedDataTypeForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedEnumerationForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedPrimitiveTypeForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedSignalForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceNestedClassifierCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getInterface_NestedClassifier();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceNestedclassifiers_7008SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case NestedClassForInterfaceEditPart.VISUAL_ID:

-		case NestedInterfaceForInterfaceEditPart.VISUAL_ID:

-		case NestedEnumerationForInterfaceEditPart.VISUAL_ID:

-		case NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID:

-		case NestedDataTypeForInterfaceEditPart.VISUAL_ID:

-		case NestedSignalForInterfaceEditPart.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getInterfaceNestedclassifiers_7008SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index c469a412791..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedDataTypeForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedEnumerationForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedPrimitiveTypeForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedSignalForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getInterface_NestedClassifier();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceNestedclassifiers_7029SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case NestedClassForInterfaceEditPart.VISUAL_ID:

-		case NestedInterfaceForInterfaceEditPart.VISUAL_ID:

-		case NestedEnumerationForInterfaceEditPart.VISUAL_ID:

-		case NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID:

-		case NestedDataTypeForInterfaceEditPart.VISUAL_ID:

-		case NestedSignalForInterfaceEditPart.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getInterfaceNestedclassifiers_7029SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 1f2675e82e9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedClassForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedDataTypeForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedEnumerationForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedInterfaceForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedPrimitiveTypeForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedSignalForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceNestedClassifierCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceNestedClassifierCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interface_2004);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Class_3008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedClassForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3038 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedInterfaceForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3054 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedEnumerationForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3048 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedPrimitiveTypeForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3043 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedDataTypeForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3049 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedSignalForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index edeab0cbebe..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedClassForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedDataTypeForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedEnumerationForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedInterfaceForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedPrimitiveTypeForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedSignalForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceNestedClassifierCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceNestedClassifierCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Interface_3023);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Class_3008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedClassForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3038 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedInterfaceForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3054 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedEnumerationForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3048 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedPrimitiveTypeForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3043 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedDataTypeForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3049 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new NestedSignalForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 158f60cbe03..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForInterfaceEditpart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionInInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceOperationCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getInterface_OwnedOperation());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getInterface_OwnedReception());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceOperations_7007SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == OperationForInterfaceEditpart.VISUAL_ID || visualID == ReceptionInInterfaceEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getInterfaceOperations_7007SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index cba532f062a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForInterfaceEditpart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionInInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceOperationCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getInterface_OwnedOperation());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getInterface_OwnedReception());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceOperations_7028SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == OperationForInterfaceEditpart.VISUAL_ID || visualID == ReceptionInInterfaceEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getInterfaceOperations_7028SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index a1fb5f187e2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ReceptionInInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceOperationCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceOperationCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interface_2004);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Operation_3007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new OperationForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Reception_3039 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ReceptionInInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index bbd6292d6b5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ReceptionInInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceOperationCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceOperationCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Interface_3023);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Operation_3007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new OperationForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Reception_3039 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ReceptionInInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
deleted file mode 100644
index d3a6888bac7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceRealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceRealizationItemSemanticEditPolicy() {

-		super(UMLElementTypes.InterfaceRealization_4003);

-	}

-

-	/**

-	 * @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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelCanonicalEditPolicy.java
deleted file mode 100644
index 9bcb7a4d384..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelCanonicalEditPolicy.java
+++ /dev/null
@@ -1,824 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-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.gmf.tooling.runtime.update.UpdaterLinkDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassDashedLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContainmentLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContainmentSubLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationSetEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationItemEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationItemEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShortCutDiagramEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLLinkDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ModelCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getPackage_PackagedElement());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getElement_OwnedComment());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPackage_1000SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case DependencyNodeEditPart.VISUAL_ID:

-		case AssociationClassEditPart.VISUAL_ID:

-		case AssociationNodeEditPart.VISUAL_ID:

-		case InstanceSpecificationEditPart.VISUAL_ID:

-		case ComponentEditPart.VISUAL_ID:

-		case SignalEditPart.VISUAL_ID:

-		case InterfaceEditPart.VISUAL_ID:

-		case ModelEditPartTN.VISUAL_ID:

-		case EnumerationEditPart.VISUAL_ID:

-		case PackageEditPart.VISUAL_ID:

-		case InformationItemEditPart.VISUAL_ID:

-		case ClassEditPart.VISUAL_ID:

-		case PrimitiveTypeEditPart.VISUAL_ID:

-		case DataTypeEditPart.VISUAL_ID:

-		case ConstraintEditPart.VISUAL_ID:

-		case CommentEditPart.VISUAL_ID:

-		case ShortCutDiagramEditPart.VISUAL_ID:

-		case DurationObservationEditPart.VISUAL_ID:

-		case TimeObservationEditPart.VISUAL_ID:

-		case DefaultNamedElementEditPart.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getPackage_1000SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-

-		Collection<IAdaptable> createdConnectionViews = refreshConnections();

-

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		createdViews.addAll(createdConnectionViews);

-

-		makeViewsImmutable(createdViews);

-	}

-

-	/**

-	 * @generated

-	 */

-	private Collection<IAdaptable> refreshConnections() {

-		Domain2Notation domain2NotationMap = new Domain2Notation();

-		Collection<UMLLinkDescriptor> linkDescriptors = collectAllLinks(getDiagram(), domain2NotationMap);

-		List<View> edges = new ArrayList<View>();

-		for (Object edge : getDiagram().getEdges())

-		{

-			if (edge instanceof View)

-			{

-				edges.add((View) edge);

-			}

-		}

-		Collection<View> existingLinks = new LinkedList<View>(edges);

-		for (Iterator<View> linksIterator = existingLinks.iterator(); linksIterator.hasNext();) {

-			Edge nextDiagramLink = (Edge) linksIterator.next();

-			int diagramLinkVisualID = UMLVisualIDRegistry.getVisualID(nextDiagramLink);

-			if (diagramLinkVisualID == -1 || diagramLinkVisualID == AssociationClassDashedLinkEditPart.VISUAL_ID || diagramLinkVisualID == ContainmentSubLinkEditPart.VISUAL_ID || diagramLinkVisualID == ContainmentLinkEditPart.VISUAL_ID) {

-				if (nextDiagramLink.getSource() != null && nextDiagramLink.getTarget() != null) {

-					linksIterator.remove();

-				}

-				continue;

-			}

-			EObject diagramLinkObject = nextDiagramLink.getElement();

-			EObject diagramLinkSrc = nextDiagramLink.getSource().getElement();

-			EObject diagramLinkDst = nextDiagramLink.getTarget().getElement();

-			for (Iterator<UMLLinkDescriptor> linkDescriptorsIterator = linkDescriptors.iterator(); linkDescriptorsIterator.hasNext();) {

-				UMLLinkDescriptor nextLinkDescriptor = linkDescriptorsIterator.next();

-				if (diagramLinkObject == nextLinkDescriptor.getModelElement() && diagramLinkSrc == nextLinkDescriptor.getSource() && diagramLinkDst == nextLinkDescriptor.getDestination() && diagramLinkVisualID == nextLinkDescriptor.getVisualID()) {

-					linksIterator.remove();

-					linkDescriptorsIterator.remove();

-					break;

-				}

-			}

-		}

-		deleteViews(existingLinks.iterator());

-		return createConnections(linkDescriptors, domain2NotationMap);

-	}

-

-	/**

-	 * @generated

-	 */

-	private Collection<UMLLinkDescriptor> collectAllLinks(View view, Domain2Notation domain2NotationMap) {

-		if (!ModelEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view))) {

-			return Collections.emptyList();

-		}

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		switch (UMLVisualIDRegistry.getVisualID(view)) {

-		case ModelEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getPackage_1000ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case DependencyNodeEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getDependency_2014ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case AssociationClassEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getAssociationClass_2013ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case AssociationNodeEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getAssociation_2015ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case InstanceSpecificationEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getInstanceSpecification_2001ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ComponentEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getComponent_2002ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case SignalEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getSignal_2003ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case InterfaceEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getInterface_2004ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ModelEditPartTN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getModel_2005ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case EnumerationEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getEnumeration_2006ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case PackageEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getPackage_2007ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case InformationItemEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getInformationItem_2099ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ClassEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getClass_2008ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case PrimitiveTypeEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getPrimitiveType_2009ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case DataTypeEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getDataType_2010ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ConstraintEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getConstraint_2011ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case CommentEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getComment_2012ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ShortCutDiagramEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getDiagram_2016ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case DurationObservationEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getDurationObservation_2095ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case TimeObservationEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getTimeObservation_2096ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case DefaultNamedElementEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getNamedElement_2097ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case RedefinableTemplateSignatureEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getRedefinableTemplateSignature_3015ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case TemplateSignatureEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getTemplateSignature_3033ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case InstanceSpecificationEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getInstanceSpecification_3020ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ComponentEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getComponent_3021ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case SignalEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getSignal_3022ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case InterfaceEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getInterface_3023ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ModelEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getModel_3024ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case EnumerationEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getEnumeration_3025ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case PackageEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getPackage_3009ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case InformationItemEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getInformationItem_3040ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ClassEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getClass_3010ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case PrimitiveTypeEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getPrimitiveType_3026ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case DataTypeEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getDataType_3027ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case CommentEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getComment_3028ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ConstraintEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getConstraint_3029ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case AssociationClassLinkEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getAssociationClass_4017ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case AssociationEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getAssociation_4001ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case AssociationBranchEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getAssociation_4019ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case GeneralizationEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getGeneralization_4002ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case InterfaceRealizationEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getInterfaceRealization_4003ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case SubstitutionEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getSubstitution_4004ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case RealizationEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getRealization_4005ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case AbstractionEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getAbstraction_4006ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case UsageEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getUsage_4007ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case DependencyEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getDependency_4008ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case DependencyBranchEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getDependency_4018ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ElementImportEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getElementImport_4009ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case PackageImportEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getPackageImport_4010ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case PackageMergeEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getPackageMerge_4011ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ProfileApplicationEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getProfileApplication_4012ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case TemplateBindingEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getTemplateBinding_4015ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case GeneralizationSetEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getGeneralizationSet_4020ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case InstanceSpecificationLinkEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getInstanceSpecification_4021ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case InformationFlowEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.getInformationFlow_4026ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		}

-		for (Iterator<?> children = view.getChildren().iterator(); children.hasNext();) {

-			result.addAll(collectAllLinks((View) children.next(), domain2NotationMap));

-		}

-		for (Iterator<?> edges = view.getSourceEdges().iterator(); edges.hasNext();) {

-			result.addAll(collectAllLinks((View) edges.next(), domain2NotationMap));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Collection<IAdaptable> createConnections(Collection<UMLLinkDescriptor> linkDescriptors, Domain2Notation domain2NotationMap) {

-		LinkedList<IAdaptable> adapters = new LinkedList<IAdaptable>();

-		for (UMLLinkDescriptor nextLinkDescriptor : linkDescriptors) {

-			EditPart sourceEditPart = getSourceEditPart(nextLinkDescriptor, domain2NotationMap);

-			EditPart targetEditPart = getTargetEditPart(nextLinkDescriptor, domain2NotationMap);

-			if (sourceEditPart == null || targetEditPart == null) {

-				continue;

-			}

-			CreateConnectionViewRequest.ConnectionViewDescriptor descriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(nextLinkDescriptor.getSemanticAdapter(), UMLVisualIDRegistry.getType(nextLinkDescriptor.getVisualID()), ViewUtil.APPEND,

-					false, ((IGraphicalEditPart) getHost()).getDiagramPreferencesHint());

-			CreateConnectionViewRequest ccr = new CreateConnectionViewRequest(descriptor);

-			ccr.setType(RequestConstants.REQ_CONNECTION_START);

-			ccr.setSourceEditPart(sourceEditPart);

-			sourceEditPart.getCommand(ccr);

-			ccr.setTargetEditPart(targetEditPart);

-			ccr.setType(RequestConstants.REQ_CONNECTION_END);

-			Command cmd = targetEditPart.getCommand(ccr);

-			if (cmd != null && cmd.canExecute()) {

-				executeCommand(cmd);

-				IAdaptable viewAdapter = (IAdaptable) ccr.getNewObject();

-				if (viewAdapter != null) {

-					adapters.add(viewAdapter);

-				}

-			}

-		}

-		return adapters;

-	}

-

-	/**

-	 * @generated

-	 */

-	private EditPart getEditPart(EObject domainModelElement, Domain2Notation domain2NotationMap) {

-		View view = (View) domain2NotationMap.get(domainModelElement);

-		if (view != null) {

-			return (EditPart) getHost().getViewer().getEditPartRegistry().get(view);

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Diagram getDiagram() {

-		return ((View) getHost().getModel()).getDiagram();

-	}

-

-	/**

-	 * @generated

-	 */

-	private EditPart getSourceEditPart(UpdaterLinkDescriptor descriptor, Domain2Notation domain2NotationMap) {

-		return getEditPart(descriptor.getSource(), domain2NotationMap);

-	}

-

-	/**

-	 * @generated

-	 */

-	private EditPart getTargetEditPart(UpdaterLinkDescriptor descriptor, Domain2Notation domain2NotationMap) {

-		return getEditPart(descriptor.getDestination(), domain2NotationMap);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected final EditPart getHintedEditPart(EObject domainModelElement, Domain2Notation domain2NotationMap, int hintVisualId) {

-		View view = (View) domain2NotationMap.getHinted(domainModelElement, UMLVisualIDRegistry.getType(hintVisualId));

-		if (view != null) {

-			return (EditPart) getHost().getViewer().getEditPartRegistry().get(view);

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@SuppressWarnings("serial")

-	protected static class Domain2Notation extends HashMap<EObject, View> {

-		/**

-		 * @generated

-		 */

-		public boolean containsDomainElement(EObject domainElement) {

-			return this.containsKey(domainElement);

-		}

-

-		/**

-		 * @generated

-		 */

-		public View getHinted(EObject domainEObject, String hint) {

-			return this.get(domainEObject);

-		}

-

-		/**

-		 * @generated

-		 */

-		public void putView(EObject domainElement, View view) {

-			if (!containsKey(view.getElement())) {

-				this.put(domainElement, view);

-			}

-		}

-

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelCanonicalEditPolicyCN.java
deleted file mode 100644
index 92151fb80a2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ModelCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateableElement_OwnedTemplateSignature();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getModel_3024SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID || visualID == TemplateSignatureEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getModel_3024SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelCanonicalEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelCanonicalEditPolicyTN.java
deleted file mode 100644
index bfb4b5f3d22..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelCanonicalEditPolicyTN.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ModelCanonicalEditPolicyTN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateableElement_OwnedTemplateSignature();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getModel_2005SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID || visualID == TemplateSignatureEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getModel_2005SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicy.java
deleted file mode 100644
index a842a06e36c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationNodeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ClassCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DataTypeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DefaultNamedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyNodeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.EnumerationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationItemCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InstanceSpecificationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ModelCreateCommandTN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PrimitiveTypeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ShortCutDiagramCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SignalCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ModelItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ModelItemSemanticEditPolicy() {

-		super(UMLElementTypes.Package_1000);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Dependency_2014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyNodeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.AssociationClass_2013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Association_2015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationNodeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InstanceSpecification_2001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InstanceSpecificationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_2002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_2003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SignalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_2004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Model_2005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ModelCreateCommandTN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_2006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new EnumerationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Package_2007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_2099 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationItemCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_2008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ClassCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_2009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PrimitiveTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_2010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DataTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_2011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_2012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Diagram_2016 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ShortCutDiagramCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationObservation_2095 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeObservation_2096 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.NamedElement_2097 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DefaultNamedElementCreateCommand(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyCN.java
deleted file mode 100644
index 35649b5b827..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ModelItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ModelItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Model_3024);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.RedefinableTemplateSignature_3015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RedefinableTemplateSignatureCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TemplateSignature_3033 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateSignatureCreateCommand(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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageMerge_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageMergeCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ProfileApplication_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ProfileApplicationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageMerge_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageMergeCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ProfileApplication_4012 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case PackageMergeEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageMergeReorientCommand(req));

-		case ProfileApplicationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ProfileApplicationReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyTN.java
deleted file mode 100644
index 74710a84714..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyTN.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ModelItemSemanticEditPolicyTN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ModelItemSemanticEditPolicyTN() {

-		super(UMLElementTypes.Model_2005);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.RedefinableTemplateSignature_3015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RedefinableTemplateSignatureCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TemplateSignature_3033 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateSignatureCreateCommand(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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageMerge_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageMergeCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ProfileApplication_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ProfileApplicationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageMerge_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageMergeCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ProfileApplication_4012 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case PackageMergeEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageMergeReorientCommand(req));

-		case ProfileApplicationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ProfileApplicationReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index d9dffc5bb73..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationItemEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ModelPackageableElementCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getPackage_PackagedElement());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getElement_OwnedComment());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getModelPackagedelements_7030SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case InstanceSpecificationEditPartCN.VISUAL_ID:

-		case ComponentEditPartCN.VISUAL_ID:

-		case SignalEditPartCN.VISUAL_ID:

-		case InterfaceEditPartCN.VISUAL_ID:

-		case ModelEditPartCN.VISUAL_ID:

-		case EnumerationEditPartCN.VISUAL_ID:

-		case PackageEditPartCN.VISUAL_ID:

-		case ClassEditPartCN.VISUAL_ID:

-		case PrimitiveTypeEditPartCN.VISUAL_ID:

-		case DataTypeEditPartCN.VISUAL_ID:

-		case CommentEditPartCN.VISUAL_ID:

-		case ConstraintEditPartCN.VISUAL_ID:

-		case InformationItemEditPartCN.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getModelPackagedelements_7030SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyTN.java
deleted file mode 100644
index 18676b65deb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyTN.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationItemEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ModelPackageableElementCompartmentCanonicalEditPolicyTN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getPackage_PackagedElement());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getElement_OwnedComment());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getModelPackagedelements_7009SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case InstanceSpecificationEditPartCN.VISUAL_ID:

-		case ComponentEditPartCN.VISUAL_ID:

-		case SignalEditPartCN.VISUAL_ID:

-		case InterfaceEditPartCN.VISUAL_ID:

-		case ModelEditPartCN.VISUAL_ID:

-		case EnumerationEditPartCN.VISUAL_ID:

-		case PackageEditPartCN.VISUAL_ID:

-		case ClassEditPartCN.VISUAL_ID:

-		case PrimitiveTypeEditPartCN.VISUAL_ID:

-		case DataTypeEditPartCN.VISUAL_ID:

-		case CommentEditPartCN.VISUAL_ID:

-		case ConstraintEditPartCN.VISUAL_ID:

-		case InformationItemEditPartCN.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getModelPackagedelements_7009SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 957f4d37f13..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ClassCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ComponentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InstanceSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ModelPackageableElementCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ModelPackageableElementCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Model_3024);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.InstanceSpecification_3020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InstanceSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3022 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3023 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Model_3024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ModelCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Package_3009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ClassCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3027 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3028 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3029 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3040 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java
deleted file mode 100644
index ef49c0229ca..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ClassCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ComponentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InstanceSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ModelPackageableElementCompartmentItemSemanticEditPolicyTN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ModelPackageableElementCompartmentItemSemanticEditPolicyTN() {

-		super(UMLElementTypes.Model_2005);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.InstanceSpecification_3020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InstanceSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3022 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3023 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Model_3024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ModelCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Package_3009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ClassCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3027 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3028 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3029 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3040 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedClassForClassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedClassForClassItemSemanticEditPolicy.java
deleted file mode 100644
index 211e8abb3c9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedClassForClassItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedClassForClassItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedClassForClassItemSemanticEditPolicy() {

-		super(UMLElementTypes.Class_3014);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedClassForComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedClassForComponentItemSemanticEditPolicy.java
deleted file mode 100644
index 23c7a217610..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedClassForComponentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedClassForComponentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedClassForComponentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Class_3004);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedClassForInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedClassForInterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index 9135b8e0e9a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedClassForInterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedClassForInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedClassForInterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.Class_3008);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedDataTypeForClassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedDataTypeForClassItemSemanticEditPolicy.java
deleted file mode 100644
index 26415d526fd..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedDataTypeForClassItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedDataTypeForClassItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedDataTypeForClassItemSemanticEditPolicy() {

-		super(UMLElementTypes.DataType_3044);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedDataTypeForComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedDataTypeForComponentItemSemanticEditPolicy.java
deleted file mode 100644
index f90e54e1e98..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedDataTypeForComponentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedDataTypeForComponentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedDataTypeForComponentItemSemanticEditPolicy() {

-		super(UMLElementTypes.DataType_3045);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedDataTypeForInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedDataTypeForInterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index acd3ecba384..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedDataTypeForInterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedDataTypeForInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedDataTypeForInterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.DataType_3043);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedEnumerationForClassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedEnumerationForClassItemSemanticEditPolicy.java
deleted file mode 100644
index 126abefd6dc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedEnumerationForClassItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedEnumerationForClassItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedEnumerationForClassItemSemanticEditPolicy() {

-		super(UMLElementTypes.Enumeration_3052);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedEnumerationForComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedEnumerationForComponentItemSemanticEditPolicy.java
deleted file mode 100644
index c590e252f16..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedEnumerationForComponentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedEnumerationForComponentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedEnumerationForComponentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Enumeration_3053);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedEnumerationForInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedEnumerationForInterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index 8c73058a834..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedEnumerationForInterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedEnumerationForInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedEnumerationForInterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.Enumeration_3054);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedInterfaceForClassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedInterfaceForClassItemSemanticEditPolicy.java
deleted file mode 100644
index c8ff9c81bf8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedInterfaceForClassItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedInterfaceForClassItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedInterfaceForClassItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interface_3036);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedInterfaceForComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedInterfaceForComponentItemSemanticEditPolicy.java
deleted file mode 100644
index 5220ab29b4a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedInterfaceForComponentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedInterfaceForComponentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedInterfaceForComponentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interface_3037);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedInterfaceForInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedInterfaceForInterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index 8c5293936b4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedInterfaceForInterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedInterfaceForInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedInterfaceForInterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interface_3038);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedPrimitiveTypeForClassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedPrimitiveTypeForClassItemSemanticEditPolicy.java
deleted file mode 100644
index 5165cdc2f31..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedPrimitiveTypeForClassItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedPrimitiveTypeForClassItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedPrimitiveTypeForClassItemSemanticEditPolicy() {

-		super(UMLElementTypes.PrimitiveType_3047);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedPrimitiveTypeForComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedPrimitiveTypeForComponentItemSemanticEditPolicy.java
deleted file mode 100644
index 202f50d849f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedPrimitiveTypeForComponentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedPrimitiveTypeForComponentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedPrimitiveTypeForComponentItemSemanticEditPolicy() {

-		super(UMLElementTypes.PrimitiveType_3046);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedPrimitiveTypeForInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedPrimitiveTypeForInterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index 54132610d94..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedPrimitiveTypeForInterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedPrimitiveTypeForInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedPrimitiveTypeForInterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.PrimitiveType_3048);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedSignalForClassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedSignalForClassItemSemanticEditPolicy.java
deleted file mode 100644
index 4b869782fd7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedSignalForClassItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedSignalForClassItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedSignalForClassItemSemanticEditPolicy() {

-		super(UMLElementTypes.Signal_3050);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedSignalForComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedSignalForComponentItemSemanticEditPolicy.java
deleted file mode 100644
index b7489fd694a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedSignalForComponentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedSignalForComponentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedSignalForComponentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Signal_3051);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedSignalForInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedSignalForInterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index 82bc17ffbe5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedSignalForInterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NestedSignalForInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NestedSignalForInterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.Signal_3049);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForClassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForClassItemSemanticEditPolicy.java
deleted file mode 100644
index db67a7ce314..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForClassItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class OperationForClassItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public OperationForClassItemSemanticEditPolicy() {

-		super(UMLElementTypes.Operation_3013);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForDataTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForDataTypeItemSemanticEditPolicy.java
deleted file mode 100644
index 52a7026be04..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForDataTypeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class OperationForDataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public OperationForDataTypeItemSemanticEditPolicy() {

-		super(UMLElementTypes.Operation_3019);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForInterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index 47f0db447ed..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForInterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class OperationForInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public OperationForInterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.Operation_3007);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForPrimitiveTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForPrimitiveTypeItemSemanticEditPolicy.java
deleted file mode 100644
index 2fd097361a0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForPrimitiveTypeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class OperationForPrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public OperationForPrimitiveTypeItemSemanticEditPolicy() {

-		super(UMLElementTypes.Operation_3042);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationItemSemanticEditPolicy.java
deleted file mode 100644
index 8f24b515e1c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class OperationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public OperationItemSemanticEditPolicy() {

-		super(UMLElementTypes.Operation_3003);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationTemplateParameterItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationTemplateParameterItemSemanticEditPolicy.java
deleted file mode 100644
index 01298d963d5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationTemplateParameterItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class OperationTemplateParameterItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public OperationTemplateParameterItemSemanticEditPolicy() {

-		super(UMLElementTypes.OperationTemplateParameter_3035);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageCanonicalEditPolicy.java
deleted file mode 100644
index a59f2babe0b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageCanonicalEditPolicy.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PackageCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateableElement_OwnedTemplateSignature();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPackage_2007SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID || visualID == TemplateSignatureEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getPackage_2007SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageCanonicalEditPolicyCN.java
deleted file mode 100644
index 0bc8fcf2394..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PackageCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateableElement_OwnedTemplateSignature();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPackage_3009SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID || visualID == TemplateSignatureEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getPackage_3009SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageImportItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageImportItemSemanticEditPolicy.java
deleted file mode 100644
index b4e76eb6cab..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageImportItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PackageImportItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PackageImportItemSemanticEditPolicy() {

-		super(UMLElementTypes.PackageImport_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;

-		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_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageItemSemanticEditPolicy.java
deleted file mode 100644
index d9ff00bf695..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PackageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PackageItemSemanticEditPolicy() {

-		super(UMLElementTypes.Package_2007);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.RedefinableTemplateSignature_3015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RedefinableTemplateSignatureCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TemplateSignature_3033 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateSignatureCreateCommand(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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageMerge_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageMergeCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ProfileApplication_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ProfileApplicationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageMerge_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageMergeCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ProfileApplication_4012 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case PackageMergeEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageMergeReorientCommand(req));

-		case ProfileApplicationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ProfileApplicationReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageItemSemanticEditPolicyCN.java
deleted file mode 100644
index c3ff06ec7b5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PackageItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PackageItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Package_3009);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.RedefinableTemplateSignature_3015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RedefinableTemplateSignatureCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TemplateSignature_3033 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateSignatureCreateCommand(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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageMerge_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageMergeCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ProfileApplication_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ProfileApplicationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageMerge_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageMergeCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ProfileApplication_4012 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case PackageMergeEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageMergeReorientCommand(req));

-		case ProfileApplicationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ProfileApplicationReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageMergeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageMergeItemSemanticEditPolicy.java
deleted file mode 100644
index b96c7553154..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageMergeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PackageMergeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PackageMergeItemSemanticEditPolicy() {

-		super(UMLElementTypes.PackageMerge_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;

-		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_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 8c2e73eb594..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationItemEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PackagePackageableElementCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getPackage_PackagedElement());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getElement_OwnedComment());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPackagePackagedelements_7016SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case InstanceSpecificationEditPartCN.VISUAL_ID:

-		case ComponentEditPartCN.VISUAL_ID:

-		case SignalEditPartCN.VISUAL_ID:

-		case InterfaceEditPartCN.VISUAL_ID:

-		case ModelEditPartCN.VISUAL_ID:

-		case EnumerationEditPartCN.VISUAL_ID:

-		case PackageEditPartCN.VISUAL_ID:

-		case ClassEditPartCN.VISUAL_ID:

-		case PrimitiveTypeEditPartCN.VISUAL_ID:

-		case DataTypeEditPartCN.VISUAL_ID:

-		case CommentEditPartCN.VISUAL_ID:

-		case ConstraintEditPartCN.VISUAL_ID:

-		case InformationItemEditPartCN.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getPackagePackagedelements_7016SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index 15c868a6c71..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationItemEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PackagePackageableElementCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getPackage_PackagedElement());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getElement_OwnedComment());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPackagePackagedelements_7010SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case InstanceSpecificationEditPartCN.VISUAL_ID:

-		case ComponentEditPartCN.VISUAL_ID:

-		case SignalEditPartCN.VISUAL_ID:

-		case InterfaceEditPartCN.VISUAL_ID:

-		case ModelEditPartCN.VISUAL_ID:

-		case EnumerationEditPartCN.VISUAL_ID:

-		case PackageEditPartCN.VISUAL_ID:

-		case ClassEditPartCN.VISUAL_ID:

-		case PrimitiveTypeEditPartCN.VISUAL_ID:

-		case DataTypeEditPartCN.VISUAL_ID:

-		case CommentEditPartCN.VISUAL_ID:

-		case ConstraintEditPartCN.VISUAL_ID:

-		case InformationItemEditPartCN.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getPackagePackagedelements_7010SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index fe672091713..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ClassCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ComponentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InstanceSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PackagePackageableElementCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PackagePackageableElementCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Package_2007);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.InstanceSpecification_3020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InstanceSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3022 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3023 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Model_3024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ModelCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Package_3009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ClassCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3027 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3028 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3029 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3040 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 3a72a1f32b7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ClassCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ComponentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InstanceSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PackagePackageableElementCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PackagePackageableElementCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Package_3009);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.InstanceSpecification_3020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InstanceSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3022 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3023 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Model_3024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ModelCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Package_3009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ClassCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3027 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3028 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3029 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3040 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 377f9077a29..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforPrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PrimitiveTypeAttributeCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getDataType_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeAttributes_7039SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PropertyforPrimitiveTypeEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getPrimitiveTypeAttributes_7039SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index 2c676839152..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforPrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PrimitiveTypeAttributeCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getDataType_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeAttributes_7041SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PropertyforPrimitiveTypeEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getPrimitiveTypeAttributes_7041SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 31c5b385ae5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyforPrimitiveTypeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PrimitiveTypeAttributeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeAttributeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.PrimitiveType_2009);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Property_3041 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PropertyforPrimitiveTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 65bef572391..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyforPrimitiveTypeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PrimitiveTypeAttributeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeAttributeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.PrimitiveType_3026);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Property_3041 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PropertyforPrimitiveTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
deleted file mode 100644
index e11ef001d2f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeItemSemanticEditPolicy() {

-		super(UMLElementTypes.PrimitiveType_2009);

-	}

-

-	/**

-	 * @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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
deleted file mode 100644
index 4845d5ea55b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PrimitiveTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.PrimitiveType_3026);

-	}

-

-	/**

-	 * @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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 7e4a5e09917..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForPrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PrimitiveTypeOperationCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getDataType_OwnedOperation();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeOperations_7040SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return OperationForPrimitiveTypeEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getPrimitiveTypeOperations_7040SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index bbca4928d4e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForPrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PrimitiveTypeOperationCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getDataType_OwnedOperation();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeOperations_7042SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return OperationForPrimitiveTypeEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getPrimitiveTypeOperations_7042SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 289a9711ae3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForPrimitiveTypeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PrimitiveTypeOperationCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeOperationCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.PrimitiveType_2009);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Operation_3042 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new OperationForPrimitiveTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 7d6c5fdd7d2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForPrimitiveTypeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PrimitiveTypeOperationCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeOperationCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.PrimitiveType_3026);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Operation_3042 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new OperationForPrimitiveTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ProfileApplicationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ProfileApplicationItemSemanticEditPolicy.java
deleted file mode 100644
index 2b4d746c0df..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ProfileApplicationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ProfileApplicationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ProfileApplicationItemSemanticEditPolicy() {

-		super(UMLElementTypes.ProfileApplication_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;

-		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_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForClassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForClassItemSemanticEditPolicy.java
deleted file mode 100644
index 7ac4b10bae2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForClassItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PropertyForClassItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PropertyForClassItemSemanticEditPolicy() {

-		super(UMLElementTypes.Property_3012);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForComponentItemSemanticEditPolicy.java
deleted file mode 100644
index c115b18c7a4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForComponentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PropertyForComponentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PropertyForComponentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Property_3002);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForInterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index 3ff1f9494b4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForInterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PropertyForInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PropertyForInterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.Property_3006);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForSignalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForSignalItemSemanticEditPolicy.java
deleted file mode 100644
index 7b01edb1a4f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForSignalItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PropertyForSignalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PropertyForSignalItemSemanticEditPolicy() {

-		super(UMLElementTypes.Property_3005);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyforDataTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyforDataTypeItemSemanticEditPolicy.java
deleted file mode 100644
index 2856e62a420..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyforDataTypeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PropertyforDataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PropertyforDataTypeItemSemanticEditPolicy() {

-		super(UMLElementTypes.Property_3018);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyforPrimitiveTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyforPrimitiveTypeItemSemanticEditPolicy.java
deleted file mode 100644
index fd34d73e550..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyforPrimitiveTypeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PropertyforPrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PropertyforPrimitiveTypeItemSemanticEditPolicy() {

-		super(UMLElementTypes.Property_3041);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RealizationItemSemanticEditPolicy.java
deleted file mode 100644
index acace963f1c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RealizationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class RealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public RealizationItemSemanticEditPolicy() {

-		super(UMLElementTypes.Realization_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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ReceptionInInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ReceptionInInterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index 8a8a4369b3b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ReceptionInInterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ReceptionInInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ReceptionInInterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.Reception_3039);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ReceptionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ReceptionItemSemanticEditPolicy.java
deleted file mode 100644
index d31b2784cb6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ReceptionItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ReceptionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ReceptionItemSemanticEditPolicy() {

-		super(UMLElementTypes.Reception_3011);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureItemSemanticEditPolicy.java
deleted file mode 100644
index 8fc8e66bf87..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class RedefinableTemplateSignatureItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public RedefinableTemplateSignatureItemSemanticEditPolicy() {

-		super(UMLElementTypes.RedefinableTemplateSignature_3015);

-	}

-

-	/**

-	 * @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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 5f520166b06..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassifierTemplateParameterEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectableElementTemplateParameterEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationTemplateParameterEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateParameterEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class RedefinableTemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateSignature_OwnedParameter();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getRedefinableTemplateSignatureTemplateParameterCompartment_7014SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case ClassifierTemplateParameterEditPart.VISUAL_ID:

-		case ConnectableElementTemplateParameterEditPart.VISUAL_ID:

-		case OperationTemplateParameterEditPart.VISUAL_ID:

-		case TemplateParameterEditPart.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getRedefinableTemplateSignatureTemplateParameterCompartment_7014SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index a9f906689d5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ClassifierTemplateParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectableElementTemplateParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationTemplateParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class RedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public RedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.RedefinableTemplateSignature_3015);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.ClassifierTemplateParameter_3031 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ClassifierTemplateParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ConnectableElementTemplateParameter_3034 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectableElementTemplateParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OperationTemplateParameter_3035 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new OperationTemplateParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TemplateParameter_3016 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java
deleted file mode 100644
index 280198ff41d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ShortCutDiagramItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ShortCutDiagramItemSemanticEditPolicy() {

-		super(UMLElementTypes.Diagram_2016);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 153db7e4287..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForSignalEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class SignalAttributeCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getSignal_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getSignalAttributes_7005SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PropertyForSignalEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getSignalAttributes_7005SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index b1e8a0921ff..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForSignalEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class SignalAttributeCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getSignal_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getSignalAttributes_7026SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PropertyForSignalEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getSignalAttributes_7026SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 0725a2791e3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForSignalCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class SignalAttributeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public SignalAttributeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Signal_2003);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Property_3005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PropertyForSignalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 9c1eec14e31..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForSignalCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class SignalAttributeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public SignalAttributeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Signal_3022);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.Property_3005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PropertyForSignalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalCanonicalEditPolicy.java
deleted file mode 100644
index c9af4fcef6b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalCanonicalEditPolicy.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class SignalCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateableElement_OwnedTemplateSignature();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getSignal_2003SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return RedefinableTemplateSignatureEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getSignal_2003SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalCanonicalEditPolicyCN.java
deleted file mode 100644
index 84ab2aa076e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class SignalCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateableElement_OwnedTemplateSignature();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getSignal_3022SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return RedefinableTemplateSignatureEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getSignal_3022SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalItemSemanticEditPolicy.java
deleted file mode 100644
index d84c54aa94c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,522 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class SignalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public SignalItemSemanticEditPolicy() {

-		super(UMLElementTypes.Signal_2003);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.RedefinableTemplateSignature_3015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RedefinableTemplateSignatureCreateCommand(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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalItemSemanticEditPolicyCN.java
deleted file mode 100644
index 965be22d4a0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,522 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ContextLinkReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class SignalItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public SignalItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Signal_3022);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.RedefinableTemplateSignature_3015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RedefinableTemplateSignatureCreateCommand(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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new PackageImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == 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.AssociationClass_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationClassLinkCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Association_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AssociationBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.PackageImport_4010 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TemplateBinding_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintContext_8500 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ContextLinkCreateCommand(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 GeneralizationEditPart.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 AssociationClassLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationClassLinkReorientCommand(req));

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationBranchReorientCommand(req));

-		case SubstitutionEditPart.VISUAL_ID:

-			return getGEFWrapper(new SubstitutionReorientCommand(req));

-		case RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case PackageImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new PackageImportReorientCommand(req));

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new TemplateBindingReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		case ContextLinkEditPart.VISUAL_ID:

-			return getGEFWrapper(new ContextLinkReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SlotItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SlotItemSemanticEditPolicy.java
deleted file mode 100644
index 05a6d90cdb5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SlotItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class SlotItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public SlotItemSemanticEditPolicy() {

-		super(UMLElementTypes.Slot_3030);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SubstitutionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SubstitutionItemSemanticEditPolicy.java
deleted file mode 100644
index 942291e78d8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SubstitutionItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class SubstitutionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public SubstitutionItemSemanticEditPolicy() {

-		super(UMLElementTypes.Substitution_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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateBindingItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateBindingItemSemanticEditPolicy.java
deleted file mode 100644
index 3aa4197ed03..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateBindingItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class TemplateBindingItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public TemplateBindingItemSemanticEditPolicy() {

-		super(UMLElementTypes.TemplateBinding_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_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateParameterItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateParameterItemSemanticEditPolicy.java
deleted file mode 100644
index 109f9ab8cd9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateParameterItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class TemplateParameterItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public TemplateParameterItemSemanticEditPolicy() {

-		super(UMLElementTypes.TemplateParameter_3016);

-	}

-

-	/**

-	 * @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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureItemSemanticEditPolicy.java
deleted file mode 100644
index a841701e3c9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class TemplateSignatureItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public TemplateSignatureItemSemanticEditPolicy() {

-		super(UMLElementTypes.TemplateSignature_3033);

-	}

-

-	/**

-	 * @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_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 07527c5785f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassifierTemplateParameterEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationTemplateParameterEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateParameterEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class TemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getTemplateSignature_OwnedParameter();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getTemplateSignatureTemplateParameterCompartment_7038SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == ClassifierTemplateParameterEditPart.VISUAL_ID || visualID == OperationTemplateParameterEditPart.VISUAL_ID || visualID == TemplateParameterEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.getTemplateSignatureTemplateParameterCompartment_7038SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index d4e0ce947fb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ClassifierTemplateParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationTemplateParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class TemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public TemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.TemplateSignature_3033);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-

-		if (UMLElementTypes.ClassifierTemplateParameter_3031 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ClassifierTemplateParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OperationTemplateParameter_3035 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new OperationTemplateParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TemplateParameter_3016 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TemplateParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TimeObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TimeObservationItemSemanticEditPolicy.java
deleted file mode 100644
index f391152aa53..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TimeObservationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public TimeObservationItemSemanticEditPolicy() {

-		super(UMLElementTypes.TimeObservation_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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLBaseItemSemanticEditPolicy.java
deleted file mode 100644
index 6353fee344a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,1034 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.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.Association;

-import org.eclipse.uml2.uml.AssociationClass;

-import org.eclipse.uml2.uml.BehavioredClassifier;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.Component;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.DurationObservation;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.ElementImport;

-import org.eclipse.uml2.uml.Generalization;

-import org.eclipse.uml2.uml.GeneralizationSet;

-import org.eclipse.uml2.uml.InformationFlow;

-import org.eclipse.uml2.uml.InstanceSpecification;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.InterfaceRealization;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.Node;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.PackageImport;

-import org.eclipse.uml2.uml.PackageMerge;

-import org.eclipse.uml2.uml.PackageableElement;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.ProfileApplication;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Realization;

-import org.eclipse.uml2.uml.Relationship;

-import org.eclipse.uml2.uml.Slot;

-import org.eclipse.uml2.uml.Substitution;

-import org.eclipse.uml2.uml.TemplateBinding;

-import org.eclipse.uml2.uml.TemplateableElement;

-import org.eclipse.uml2.uml.TimeObservation;

-import org.eclipse.uml2.uml.Type;

-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) {

-		// no more usage of the extended types here. 

-		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_4016(

-				) {

-			return canExistLink_4016();

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateAssociationClass_4017(

-				Package container, Type source, Type target

-				) {

-			return canExistAssociationClass_4017(

-					container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateAssociation_4001(

-				Package container, Type source, Type target

-				) {

-			return canExistAssociation_4001(

-					container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateAssociation_4019(

-				Package container, Type source, Type target

-				) {

-			return canExistAssociation_4019(

-					container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateGeneralization_4002(

-				Classifier source, Classifier target

-				) {

-			return canExistGeneralization_4002(

-					null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateInterfaceRealization_4003(

-				BehavioredClassifier source, Interface target

-				) {

-			return canExistInterfaceRealization_4003(

-					null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateSubstitution_4004(

-				Classifier container, Classifier source, Classifier target

-				) {

-			return canExistSubstitution_4004(

-					container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateRealization_4005(

-				Package container, NamedElement source, NamedElement target

-				) {

-			return canExistRealization_4005(

-					container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateAbstraction_4006(

-				Package container, NamedElement source, NamedElement target

-				) {

-			return canExistAbstraction_4006(

-					container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateUsage_4007(

-				Package container, NamedElement source, NamedElement target

-				) {

-			return canExistUsage_4007(

-					container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateDependency_4008(

-				Package container, NamedElement source, NamedElement target

-				) {

-			return canExistDependency_4008(

-					container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateDependency_4018(

-				Package container, NamedElement source, NamedElement target

-				) {

-			return canExistDependency_4018(

-					container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateElementImport_4009(

-				Namespace source, PackageableElement target

-				) {

-			return canExistElementImport_4009(

-					null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreatePackageImport_4010(

-				Namespace source, Package target

-				) {

-			return canExistPackageImport_4010(

-					null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreatePackageMerge_4011(

-				Package container, Package source, Package target

-				) {

-			return canExistPackageMerge_4011(

-					container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateProfileApplication_4012(

-				Package source, Profile target

-				) {

-			return canExistProfileApplication_4012(

-					null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateCommentAnnotatedElement_4013(

-				Comment source, Element target

-				) {

-			if (source != null) {

-				if (source.getAnnotatedElements()

-						.contains(target)) {

-					return false;

-				}

-			}

-

-			return canExistCommentAnnotatedElement_4013(

-					source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateConstraintConstrainedElement_4014(

-				Constraint source, Element target

-				) {

-			if (source != null) {

-				if (source.getConstrainedElements()

-						.contains(target)) {

-					return false;

-				}

-			}

-

-			return canExistConstraintConstrainedElement_4014(

-					source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateTemplateBinding_4015(

-				TemplateableElement container, TemplateableElement source, TemplateableElement target

-				) {

-			return canExistTemplateBinding_4015(

-					container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateGeneralizationSet_4020(

-				Package container, Generalization source, Generalization target

-				) {

-			return canExistGeneralizationSet_4020(

-					container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateInstanceSpecification_4021(

-				Package container, Slot source, Slot target

-				) {

-			return canExistInstanceSpecification_4021(

-					container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateLink_4022(

-				) {

-			return canExistLink_4022();

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateLink_4023(

-				) {

-			return canExistLink_4023();

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateTimeObservationEvent_4024(

-				TimeObservation source, NamedElement target

-				) {

-			if (source != null) {

-				if (source.getEvent()

-					!= null) {

-					return false;

-				}

-			}

-

-			return canExistTimeObservationEvent_4024(

-					source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateDurationObservationEvent_4025(

-				DurationObservation source, NamedElement target

-				) {

-			if (source != null) {

-				if (source.getEvents()

-						.size() >= 2

-						||

-						source.getEvents()

-								.contains(target)) {

-					return false;

-				}

-			}

-

-			return canExistDurationObservationEvent_4025(

-					source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateInformationFlow_4026(

-				Package container, NamedElement source, NamedElement target

-				) {

-			return canExistInformationFlow_4026(

-					container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateConstraintContext_8500(

-				Constraint source, Namespace target

-				) {

-			if (source != null) {

-				if (source.getContext()

-					!= null) {

-					return false;

-				}

-			}

-			if (target != null && (target.getOwnedRules()

-					.contains(target)

-					)) {

-				return false;

-			}

-

-			return canExistConstraintContext_8500(

-					source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistLink_4016(

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistAssociationClass_4017(

-				Package container, AssociationClass linkInstance, Type source, Type target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistAssociation_4001(

-				Package container, Association linkInstance, Type source, Type target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistAssociation_4019(

-				Package container, Association linkInstance, Type source, Type target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistGeneralization_4002(

-				Generalization linkInstance, Classifier source, Classifier target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistInterfaceRealization_4003(

-				InterfaceRealization linkInstance, BehavioredClassifier source, Interface target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistSubstitution_4004(

-				Classifier container, Substitution linkInstance, Classifier source, Classifier target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistRealization_4005(

-				Package container, Realization linkInstance, NamedElement source, NamedElement target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistAbstraction_4006(

-				Package container, Abstraction linkInstance, NamedElement source, NamedElement target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistUsage_4007(

-				Package container, Usage linkInstance, NamedElement source, NamedElement target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistDependency_4008(

-				Package container, Dependency linkInstance, NamedElement source, NamedElement target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistDependency_4018(

-				Package container, Dependency linkInstance, NamedElement source, NamedElement target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistElementImport_4009(

-				ElementImport linkInstance, Namespace source, PackageableElement target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistPackageImport_4010(

-				PackageImport linkInstance, Namespace source, Package target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistPackageMerge_4011(

-				Package container, PackageMerge linkInstance, Package source, Package target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistProfileApplication_4012(

-				ProfileApplication linkInstance, Package source, Profile target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistCommentAnnotatedElement_4013(

-				Comment source, Element target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistConstraintConstrainedElement_4014(

-				Constraint source, Element target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistTemplateBinding_4015(

-				TemplateableElement container, TemplateBinding linkInstance, TemplateableElement source, TemplateableElement target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistGeneralizationSet_4020(

-				Package container, GeneralizationSet linkInstance, Generalization source, Generalization target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistInstanceSpecification_4021(

-				Package container, InstanceSpecification linkInstance, Slot source, Slot target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistLink_4022(

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistLink_4023(

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistTimeObservationEvent_4024(

-				TimeObservation source, NamedElement target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistDurationObservationEvent_4025(

-				DurationObservation source, NamedElement target

-				) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistInformationFlow_4026(

-				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;

-			}

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistConstraintContext_8500(

-				Constraint source, Namespace target

-				) {

-			return true;

-		}

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextNonResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextNonResizableEditPolicy.java
deleted file mode 100644
index 06ce89d3ba5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextNonResizableEditPolicy.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextSelectionEditPolicy.java
deleted file mode 100644
index 0a303a522f5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextSelectionEditPolicy.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UsageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UsageItemSemanticEditPolicy.java
deleted file mode 100644
index 5d2365f5ee4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UsageItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InformationFlowReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class UsageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public UsageItemSemanticEditPolicy() {

-		super(UMLElementTypes.Usage_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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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.Realization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new Dependency3CreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ElementImport_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ElementImportCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4024 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4025 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4026 == 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 RealizationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RealizationReorientCommand(req));

-		case AbstractionEditPart.VISUAL_ID:

-			return getGEFWrapper(new AbstractionReorientCommand(req));

-		case UsageEditPart.VISUAL_ID:

-			return getGEFWrapper(new UsageReorientCommand(req));

-		case DependencyEditPart.VISUAL_ID:

-			return getGEFWrapper(new DependencyReorientCommand(req));

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getGEFWrapper(new Dependency2ReorientCommand(req));

-		case ElementImportEditPart.VISUAL_ID:

-			return getGEFWrapper(new ElementImportReorientCommand(req));

-		case InformationFlowEditPart.VISUAL_ID:

-			return getGEFWrapper(new InformationFlowReorientCommand(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 ConnectorTimeObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorTimeObservationReorientCommand(req));

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConnectorDurationObservationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLAbstractExpression.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLAbstractExpression.java
deleted file mode 100644
index e7851276d98..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLAbstractExpression.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.expressions;

-

-import java.math.BigDecimal;

-import java.math.BigInteger;

-import java.util.Collections;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EEnumLiteral;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-

-/**

- * @generated

- */

-public abstract class UMLAbstractExpression {

-

-	/**

-	 * @generated

-	 */

-	private IStatus status = Status.OK_STATUS;

-

-	/**

-	 * @generated

-	 */

-	protected void setStatus(int severity, String message, Throwable throwable) {

-		String pluginID = UMLDiagramEditorPlugin.ID;

-		this.status = new Status(severity, pluginID, -1, (message != null) ? message : "", throwable); //$NON-NLS-1$

-		if (!this.status.isOK()) {

-			UMLDiagramEditorPlugin.getInstance().logError("Expression problem:" + message + "body:" + body(), throwable); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public IStatus getStatus() {

-		return status;

-	}

-

-	/**

-	 * @generated

-	 */

-	private final String myBody;

-

-	/**

-	 * @generated

-	 */

-	public String body() {

-		return myBody;

-	}

-

-	/**

-	 * @generated

-	 */

-	private final EClassifier myContext;

-

-	/**

-	 * @generated

-	 */

-	public EClassifier context() {

-		return myContext;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected UMLAbstractExpression(String body, EClassifier context) {

-		myBody = body;

-		myContext = context;

-	}

-

-	/**

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	protected abstract Object doEvaluate(Object context, Map env);

-

-	/**

-	 * @generated

-	 */

-	public Object evaluate(Object context) {

-		return evaluate(context, Collections.EMPTY_MAP);

-	}

-

-	/**

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	public Object evaluate(Object context, Map env) {

-		if (context().isInstance(context)) {

-			try {

-				return doEvaluate(context, env);

-			} catch (Exception e) {

-				UMLDiagramEditorPlugin.getInstance().logError("Expression evaluation failure: " + body(), e); //$NON-NLS-1$

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Expression may return number value which is not directly compatible with feature type (e.g. Double when Integer is expected), or EEnumLiteral meta-object when literal instance is expected

-	 * @generated

-	 */

-	public static Object performCast(Object value, EDataType targetType) {

-		if (targetType instanceof EEnum) {

-			if (value instanceof EEnumLiteral) {

-				EEnumLiteral literal = (EEnumLiteral) value;

-				return (literal.getInstance() != null) ? literal.getInstance() : literal;

-			}

-		}

-		if (false == value instanceof Number || targetType == null || targetType.getInstanceClass() == null) {

-			return value;

-		}

-		Class<?> targetClass = targetType.getInstanceClass();

-		Number num = (Number) value;

-		Class<?> valClass = value.getClass();

-		Class<?> targetWrapperClass = targetClass;

-		if (targetClass.isPrimitive()) {

-			targetWrapperClass = EcoreUtil.wrapperClassFor(targetClass);

-		}

-		if (valClass.equals(targetWrapperClass)) {

-			return value;

-		}

-		if (Number.class.isAssignableFrom(targetWrapperClass)) {

-			if (targetWrapperClass.equals(Byte.class))

-				return new Byte(num.byteValue());

-			if (targetWrapperClass.equals(Integer.class))

-				return new Integer(num.intValue());

-			if (targetWrapperClass.equals(Short.class))

-				return new Short(num.shortValue());

-			if (targetWrapperClass.equals(Long.class))

-				return new Long(num.longValue());

-			if (targetWrapperClass.equals(BigInteger.class))

-				return BigInteger.valueOf(num.longValue());

-			if (targetWrapperClass.equals(Float.class))

-				return new Float(num.floatValue());

-			if (targetWrapperClass.equals(Double.class))

-				return new Double(num.doubleValue());

-			if (targetWrapperClass.equals(BigDecimal.class))

-				return new BigDecimal(num.doubleValue());

-		}

-		return value;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLOCLFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLOCLFactory.java
deleted file mode 100644
index a84c9beabe4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLOCLFactory.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.expressions;

-

-import java.util.Collections;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EParameter;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.ocl.Environment;

-import org.eclipse.ocl.EvaluationEnvironment;

-import org.eclipse.ocl.ParserException;

-import org.eclipse.ocl.ecore.EcoreFactory;

-import org.eclipse.ocl.ecore.OCLExpression;

-import org.eclipse.ocl.ecore.Variable;

-import org.eclipse.ocl.ecore.OCL.Helper;

-import org.eclipse.ocl.options.ParsingOptions;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-

-/**

- * @generated

- */

-public class UMLOCLFactory {

-

-	/**

-	 * @generated

-	 */

-	private final UMLAbstractExpression[] expressions;

-

-	/**

-	 * @generated

-	 */

-	private final String[] expressionBodies;

-

-	/**

-	 * @generated

-	 */

-	protected UMLOCLFactory() {

-		this.expressions = new UMLAbstractExpression[1];

-		this.expressionBodies = new String[] { "\' \'", //$NON-NLS-1$

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	private static UMLOCLFactory getInstance() {

-		UMLOCLFactory instance = UMLDiagramEditorPlugin.getInstance().getUMLOCLFactory();

-		if (instance == null) {

-			UMLDiagramEditorPlugin.getInstance().setUMLOCLFactory(instance = new UMLOCLFactory());

-		}

-		return instance;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static String getExpressionBody(int index) {

-		return getInstance().expressionBodies[index];

-	}

-

-	/**

-	 * @generated

-	 */

-	public static UMLAbstractExpression getExpression(int index, EClassifier context, Map<String, EClassifier> environment) {

-		UMLOCLFactory cached = getInstance();

-		if (index < 0 || index >= cached.expressions.length) {

-			throw new IllegalArgumentException();

-		}

-		if (cached.expressions[index] == null) {

-			cached.expressions[index] = getExpression(cached.expressionBodies[index], context, environment == null ? Collections.<String, EClassifier> emptyMap() : environment);

-		}

-		return cached.expressions[index];

-	}

-

-	/**

-	 * This is factory method, callers are responsible to keep reference to the return value if they want to reuse parsed expression

-	 * @generated

-	 */

-	public static UMLAbstractExpression getExpression(String body, EClassifier context, Map<String, EClassifier> environment) {

-		return new Expression(body, context, environment);

-	}

-

-	/**

-	 * This method will become private in the next release

-	 * @generated

-	 */

-	public static UMLAbstractExpression getExpression(String body, EClassifier context) {

-		return getExpression(body, context, Collections.<String, EClassifier> emptyMap());

-	}

-

-	/**

-	 * @generated

-	 */

-	private static class Expression extends UMLAbstractExpression {

-

-		/**

-		 * @generated

-		 */

-		private final org.eclipse.ocl.ecore.OCL oclInstance;

-

-		/**

-		 * @generated

-		 */

-		private OCLExpression oclExpression;

-

-		/**

-		 * @generated

-		 */

-		public Expression(String body, EClassifier context, Map<String, EClassifier> environment) {

-			super(body, context);

-			oclInstance = org.eclipse.ocl.ecore.OCL.newInstance();

-			initCustomEnv(oclInstance.getEnvironment(), environment);

-			Helper oclHelper = oclInstance.createOCLHelper();

-			oclHelper.setContext(context());

-			try {

-				oclExpression = oclHelper.createQuery(body());

-				setStatus(IStatus.OK, null, null);

-			} catch (ParserException e) {

-				setStatus(IStatus.ERROR, e.getMessage(), e);

-			}

-		}

-

-		/**

-		 * @generated

-		 */

-		@SuppressWarnings("rawtypes")

-		protected Object doEvaluate(Object context, Map env) {

-			if (oclExpression == null) {

-				return null;

-			}

-			// on the first call, both evalEnvironment and extentMap are clear, for later we have finally, below.

-			EvaluationEnvironment<?, ?, ?, ?, ?> evalEnv = oclInstance.getEvaluationEnvironment();

-			// initialize environment

-			for (Object nextKey : env.keySet()) {

-				evalEnv.replace((String) nextKey, env.get(nextKey));

-			}

-			try {

-				Object result = oclInstance.evaluate(context, oclExpression);

-				return oclInstance.isInvalid(result) ? null : result;

-			} finally {

-				evalEnv.clear();

-				oclInstance.setExtentMap(null); // clear allInstances cache, and get the oclInstance ready for the next call

-			}

-		}

-

-		/**

-		 * @generated

-		 */

-		private static void initCustomEnv(Environment<?, EClassifier, ?, ?, ?, EParameter, ?, ?, ?, ?, ?, ?> ecoreEnv, Map<String, EClassifier> environment) {

-			// Use EObject as implicit root class for any object, to allow eContainer() and other EObject operations from OCL expressions

-			ParsingOptions.setOption(ecoreEnv, ParsingOptions.implicitRootClass(ecoreEnv), EcorePackage.eINSTANCE.getEObject());

-			for (String varName : environment.keySet()) {

-				EClassifier varType = environment.get(varName);

-				ecoreEnv.addElement(varName, createVar(ecoreEnv, varName, varType), false);

-			}

-		}

-

-		/**

-		 * @generated

-		 */

-		private static Variable createVar(Environment<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?> ecoreEnv, String name, EClassifier type) {

-			Variable var = EcoreFactory.eINSTANCE.createVariable();

-			var.setName(name);

-			var.setType(ecoreEnv.getUMLReflection().getOCLType(type));

-			return var;

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLAbstractNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLAbstractNavigatorItem.java
deleted file mode 100644
index 0195269d438..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLAbstractNavigatorItem.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.navigator;

-

-import org.eclipse.core.runtime.IAdapterFactory;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.core.runtime.PlatformObject;

-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;

-

-/**

- * @generated

- */

-public abstract class UMLAbstractNavigatorItem extends PlatformObject {

-

-	/**

-	 * @generated

-	 */

-	static {

-		@SuppressWarnings("rawtypes")

-		final Class[] supportedTypes = new Class[] { ITabbedPropertySheetPageContributor.class };

-		final ITabbedPropertySheetPageContributor propertySheetPageContributor = new ITabbedPropertySheetPageContributor() {

-			public String getContributorId() {

-				return "org.eclipse.papyrus.uml.diagram.clazz"; //$NON-NLS-1$

-			}

-		};

-		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

-

-			@SuppressWarnings("rawtypes")

-			public Object getAdapter(Object adaptableObject, Class adapterType) {

-				if (adaptableObject instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem && adapterType == ITabbedPropertySheetPageContributor.class) {

-					return propertySheetPageContributor;

-				}

-				return null;

-			}

-

-			@SuppressWarnings("rawtypes")

-			public Class[] getAdapterList() {

-				return supportedTypes;

-			}

-		}, org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem.class);

-	}

-

-	/**

-	 * @generated

-	 */

-	private Object myParent;

-

-	/**

-	 * @generated

-	 */

-	protected UMLAbstractNavigatorItem(Object parent) {

-		myParent = parent;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Object getParent() {

-		return myParent;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorContentProvider.java
deleted file mode 100644
index d09e565c707..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorContentProvider.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.navigator;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.ui.IMemento;

-import org.eclipse.ui.navigator.ICommonContentExtensionSite;

-import org.eclipse.ui.navigator.ICommonContentProvider;

-

-/**

- * @generated

- */

-public class UMLDomainNavigatorContentProvider implements ICommonContentProvider {

-

-	/**

-	 * @generated

-	 */

-	private AdapterFactoryContentProvider myAdapterFctoryContentProvier;

-

-	/**

-	 * @generated

-	 */

-	private static final Object[] EMPTY_ARRAY = new Object[0];

-

-	/**

-	 * @generated

-	 */

-	private Viewer myViewer;

-

-	/**

-	 * @generated

-	 */

-	private AdapterFactoryEditingDomain myEditingDomain;

-

-	/**

-	 * @generated

-	 */

-	private WorkspaceSynchronizer myWorkspaceSynchronizer;

-

-	/**

-	 * @generated

-	 */

-	private Runnable myViewerRefreshRunnable;

-

-	/**

-	 * @generated

-	 */

-	public UMLDomainNavigatorContentProvider() {

-		myAdapterFctoryContentProvier = new AdapterFactoryContentProvider(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());

-		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE.createEditingDomain();

-		myEditingDomain = (AdapterFactoryEditingDomain) editingDomain;

-		@SuppressWarnings("serial")

-		Map<Resource, Boolean> map = new HashMap<Resource, Boolean>() {

-			public Boolean get(java.lang.Object key) {

-				if (!containsKey(key)) {

-					if (key instanceof Resource) {

-						put((Resource) key, Boolean.TRUE);

-					}

-				}

-				return super.get(key);

-			}

-		};

-		myEditingDomain.setResourceToReadOnlyMap(map);

-		myViewerRefreshRunnable = new Runnable() {

-			public void run() {

-				if (myViewer != null) {

-					myViewer.refresh();

-				}

-			}

-		};

-		myWorkspaceSynchronizer = new WorkspaceSynchronizer(editingDomain, new WorkspaceSynchronizer.Delegate() {

-			public void dispose() {

-			}

-

-			public boolean handleResourceChanged(final Resource resource) {

-				for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) {

-					Resource nextResource = (Resource) it.next();

-					nextResource.unload();

-				}

-				if (myViewer != null) {

-					myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable);

-				}

-				return true;

-			}

-

-			public boolean handleResourceDeleted(Resource resource) {

-				for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) {

-					Resource nextResource = (Resource) it.next();

-					nextResource.unload();

-				}

-				if (myViewer != null) {

-					myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable);

-				}

-				return true;

-			}

-

-			public boolean handleResourceMoved(Resource resource, final URI newURI) {

-				for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) {

-					Resource nextResource = (Resource) it.next();

-					nextResource.unload();

-				}

-				if (myViewer != null) {

-					myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable);

-				}

-				return true;

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	public void dispose() {

-		myWorkspaceSynchronizer.dispose();

-		myWorkspaceSynchronizer = null;

-		myViewerRefreshRunnable = null;

-

-		for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) {

-			Resource resource = (Resource) it.next();

-			resource.unload();

-		}

-

-		((TransactionalEditingDomain) myEditingDomain).dispose();

-		myEditingDomain = null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		myViewer = viewer;

-	}

-

-	/**

-	 * @generated

-	 */

-	void unloadAllResources() {

-		for (Resource nextResource : myEditingDomain.getResourceSet().getResources()) {

-			nextResource.unload();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	void asyncRefresh() {

-		if (myViewer != null && !myViewer.getControl().isDisposed()) {

-			myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public Object[] getElements(Object inputElement) {

-		return getChildren(inputElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	public void restoreState(IMemento aMemento) {

-	}

-

-	/**

-	 * @generated

-	 */

-	public void saveState(IMemento aMemento) {

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init(ICommonContentExtensionSite aConfig) {

-	}

-

-	/**

-	 * @generated

-	 */

-	public Object[] getChildren(Object parentElement) {

-		if (parentElement instanceof IFile) {

-			IFile file = (IFile) parentElement;

-			URI fileURI = URI.createPlatformResourceURI(file.getFullPath().toString(), true);

-			Resource resource = myEditingDomain.getResourceSet().getResource(fileURI, true);

-			return wrapEObjects(myAdapterFctoryContentProvier.getChildren(resource), parentElement);

-		}

-

-		if (parentElement instanceof UMLDomainNavigatorItem) {

-			return wrapEObjects(myAdapterFctoryContentProvier.getChildren(((UMLDomainNavigatorItem) parentElement).getEObject()), parentElement);

-		}

-		return EMPTY_ARRAY;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Object[] wrapEObjects(Object[] objects, Object parentElement) {

-		Collection<UMLDomainNavigatorItem> result = new ArrayList<UMLDomainNavigatorItem>();

-		for (int i = 0; i < objects.length; i++) {

-			if (objects[i] instanceof EObject) {

-				result.add(new UMLDomainNavigatorItem((EObject) objects[i], parentElement, myAdapterFctoryContentProvier));

-			}

-		}

-		return result.toArray();

-	}

-

-	/**

-	 * @generated

-	 */

-	public Object getParent(Object element) {

-		if (element instanceof UMLAbstractNavigatorItem) {

-			UMLAbstractNavigatorItem abstractNavigatorItem = (UMLAbstractNavigatorItem) element;

-			return abstractNavigatorItem.getParent();

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean hasChildren(Object element) {

-		return element instanceof IFile || getChildren(element).length > 0;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorItem.java
deleted file mode 100644
index de7fcea95f0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorItem.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.navigator;

-

-import org.eclipse.core.runtime.IAdapterFactory;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.core.runtime.PlatformObject;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.ui.views.properties.IPropertySource;

-import org.eclipse.ui.views.properties.IPropertySourceProvider;

-

-/**

- * @generated

- */

-public class UMLDomainNavigatorItem extends PlatformObject {

-

-	/**

-	 * @generated

-	 */

-	static {

-		@SuppressWarnings("rawtypes")

-		final Class[] supportedTypes = new Class[] { EObject.class, IPropertySource.class };

-		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

-

-			@SuppressWarnings("rawtypes")

-			public Object getAdapter(Object adaptableObject, Class adapterType) {

-				if (adaptableObject instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem) {

-					org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem domainNavigatorItem = (org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem) adaptableObject;

-					EObject eObject = domainNavigatorItem.getEObject();

-					if (adapterType == EObject.class) {

-						return eObject;

-					}

-					if (adapterType == IPropertySource.class) {

-						return domainNavigatorItem.getPropertySourceProvider().getPropertySource(eObject);

-					}

-				}

-

-				return null;

-			}

-

-			@SuppressWarnings("rawtypes")

-			public Class[] getAdapterList() {

-				return supportedTypes;

-			}

-		}, org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem.class);

-	}

-

-	/**

-	 * @generated

-	 */

-	private Object myParent;

-

-	/**

-	 * @generated

-	 */

-	private EObject myEObject;

-

-	/**

-	 * @generated

-	 */

-	private IPropertySourceProvider myPropertySourceProvider;

-

-	/**

-	 * @generated

-	 */

-	public UMLDomainNavigatorItem(EObject eObject, Object parent, IPropertySourceProvider propertySourceProvider) {

-		myParent = parent;

-		myEObject = eObject;

-		myPropertySourceProvider = propertySourceProvider;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Object getParent() {

-		return myParent;

-	}

-

-	/**

-	 * @generated

-	 */

-	public EObject getEObject() {

-		return myEObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	public IPropertySourceProvider getPropertySourceProvider() {

-		return myPropertySourceProvider;

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean equals(Object obj) {

-		if (obj instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem) {

-			return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem) obj).getEObject()));

-		}

-		return super.equals(obj);

-	}

-

-	/**

-	 * @generated

-	 */

-	public int hashCode() {

-		return EcoreUtil.getURI(getEObject()).hashCode();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorLabelProvider.java
deleted file mode 100644
index f3e18f8649f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorLabelProvider.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.navigator;

-

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.ui.IMemento;

-import org.eclipse.ui.navigator.ICommonContentExtensionSite;

-import org.eclipse.ui.navigator.ICommonLabelProvider;

-

-/**

- * @generated

- */

-public class UMLDomainNavigatorLabelProvider implements ICommonLabelProvider {

-

-	/**

-	 * @generated

-	 */

-	private AdapterFactoryLabelProvider myAdapterFactoryLabelProvider = new AdapterFactoryLabelProvider(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());

-

-	/**

-	 * @generated

-	 */

-	public void init(ICommonContentExtensionSite aConfig) {

-	}

-

-	/**

-	 * @generated

-	 */

-	public Image getImage(Object element) {

-		if (element instanceof UMLDomainNavigatorItem) {

-			return myAdapterFactoryLabelProvider.getImage(((UMLDomainNavigatorItem) element).getEObject());

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getText(Object element) {

-		if (element instanceof UMLDomainNavigatorItem) {

-			return myAdapterFactoryLabelProvider.getText(((UMLDomainNavigatorItem) element).getEObject());

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void addListener(ILabelProviderListener listener) {

-		myAdapterFactoryLabelProvider.addListener(listener);

-	}

-

-	/**

-	 * @generated

-	 */

-	public void dispose() {

-		myAdapterFactoryLabelProvider.dispose();

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean isLabelProperty(Object element, String property) {

-		return myAdapterFactoryLabelProvider.isLabelProperty(element, property);

-	}

-

-	/**

-	 * @generated

-	 */

-	public void removeListener(ILabelProviderListener listener) {

-		myAdapterFactoryLabelProvider.removeListener(listener);

-	}

-

-	/**

-	 * @generated

-	 */

-	public void restoreState(IMemento aMemento) {

-	}

-

-	/**

-	 * @generated

-	 */

-	public void saveState(IMemento aMemento) {

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getDescription(Object anElement) {

-		return null;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorActionProvider.java
deleted file mode 100644
index 6e6bb9de624..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorActionProvider.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.navigator;

-

-import org.eclipse.core.runtime.IAdaptable;

-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.util.EcoreUtil;

-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.navigator.CommonActionProvider;

-import org.eclipse.ui.navigator.ICommonActionConstants;

-import org.eclipse.ui.navigator.ICommonActionExtensionSite;

-import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;

-import org.eclipse.ui.part.FileEditorInput;

-

-/**

- * @generated

- */

-public class UMLNavigatorActionProvider extends CommonActionProvider {

-

-	/**

-	 * @generated

-	 */

-	private boolean myContribute;

-

-	/**

-	 * @generated

-	 */

-	private OpenDiagramAction myOpenDiagramAction;

-

-	/**

-	 * @generated

-	 */

-	public void init(ICommonActionExtensionSite aSite) {

-		super.init(aSite);

-		if (aSite.getViewSite() instanceof ICommonViewerWorkbenchSite) {

-			myContribute = true;

-			makeActions((ICommonViewerWorkbenchSite) aSite.getViewSite());

-		} else {

-			myContribute = false;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void makeActions(ICommonViewerWorkbenchSite viewerSite) {

-		myOpenDiagramAction = new OpenDiagramAction(viewerSite);

-	}

-

-	/**

-	 * @generated

-	 */

-	public void fillActionBars(IActionBars actionBars) {

-		if (!myContribute) {

-			return;

-		}

-		IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();

-		myOpenDiagramAction.selectionChanged(selection);

-		if (myOpenDiagramAction.isEnabled()) {

-			actionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, myOpenDiagramAction);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void fillContextMenu(IMenuManager menu) {

-	}

-

-	/**

-	 * @generated

-	 */

-	private static class OpenDiagramAction extends Action {

-

-		/**

-		 * @generated

-		 */

-		private Diagram myDiagram;

-

-		/**

-		 * @generated

-		 */

-		private ICommonViewerWorkbenchSite myViewerSite;

-

-		/**

-		 * @generated

-		 */

-		public OpenDiagramAction(ICommonViewerWorkbenchSite viewerSite) {

-			super(Messages.NavigatorActionProvider_OpenDiagramActionName);

-			myViewerSite = viewerSite;

-		}

-

-		/**

-		 * @generated

-		 */

-		public final void selectionChanged(IStructuredSelection selection) {

-			myDiagram = null;

-			if (selection.size() == 1) {

-				Object selectedElement = selection.getFirstElement();

-				if (selectedElement instanceof UMLNavigatorItem) {

-					selectedElement = ((UMLNavigatorItem) selectedElement).getView();

-				} else if (selectedElement instanceof IAdaptable) {

-					selectedElement = ((IAdaptable) selectedElement).getAdapter(View.class);

-				}

-				if (selectedElement instanceof Diagram) {

-					Diagram diagram = (Diagram) selectedElement;

-					if (ModelEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(diagram))) {

-						myDiagram = diagram;

-					}

-				}

-			}

-			setEnabled(myDiagram != null);

-		}

-

-		/**

-		 * @generated

-		 */

-		public void run() {

-			if (myDiagram == null || myDiagram.eResource() == null) {

-				return;

-			}

-

-			IEditorInput editorInput = getEditorInput(myDiagram);

-			IWorkbenchPage page = myViewerSite.getPage();

-			try {

-				page.openEditor(editorInput, UMLDiagramEditor.ID);

-			} catch (PartInitException e) {

-				UMLDiagramEditorPlugin.getInstance().logError("Exception while openning diagram", e); //$NON-NLS-1$

-			}

-		}

-

-		/**

-		 * @generated

-		 */

-		private static IEditorInput getEditorInput(Diagram diagram) {

-			Resource diagramResource = diagram.eResource();

-			for (EObject nextEObject : diagramResource.getContents()) {

-				if (nextEObject == diagram) {

-					return new FileEditorInput(WorkspaceSynchronizer.getFile(diagramResource));

-				}

-				if (nextEObject instanceof Diagram) {

-					break;

-				}

-			}

-			URI uri = EcoreUtil.getURI(diagram);

-			String editorName = uri.lastSegment() + '#' + diagram.eResource().getContents().indexOf(diagram);

-			IEditorInput editorInput = new URIEditorInput(uri, editorName);

-			return editorInput;

-		}

-

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorContentProvider.java
deleted file mode 100644
index 35d30f94f88..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorContentProvider.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.navigator;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.ui.IMemento;

-import org.eclipse.ui.navigator.ICommonContentExtensionSite;

-import org.eclipse.ui.navigator.ICommonContentProvider;

-

-/**

- * @generated

- */

-public class UMLNavigatorContentProvider implements ICommonContentProvider {

-

-	/**

-	 * @generated

-	 */

-	private static final Object[] EMPTY_ARRAY = new Object[0];

-

-	/**

-	 * @generated

-	 */

-	private Viewer myViewer;

-

-	/**

-	 * @generated

-	 */

-	private AdapterFactoryEditingDomain myEditingDomain;

-

-	/**

-	 * @generated

-	 */

-	private WorkspaceSynchronizer myWorkspaceSynchronizer;

-

-	/**

-	 * @generated

-	 */

-	private Runnable myViewerRefreshRunnable;

-

-	/**

-	 * @generated

-	 */

-	public UMLNavigatorContentProvider() {

-		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE.createEditingDomain();

-		myEditingDomain = (AdapterFactoryEditingDomain) editingDomain;

-		@SuppressWarnings("serial")

-		Map<Resource, Boolean> map = new HashMap<Resource, Boolean>() {

-			public Boolean get(java.lang.Object key) {

-				if (!containsKey(key)) {

-					if (key instanceof Resource) {

-						put((Resource) key, Boolean.TRUE);

-					}

-				}

-				return super.get(key);

-			}

-		};

-		myEditingDomain.setResourceToReadOnlyMap(map);

-		myViewerRefreshRunnable = new Runnable() {

-			public void run() {

-				if (myViewer != null) {

-					myViewer.refresh();

-				}

-			}

-		};

-		myWorkspaceSynchronizer = new WorkspaceSynchronizer(editingDomain, new WorkspaceSynchronizer.Delegate() {

-			public void dispose() {

-			}

-

-			public boolean handleResourceChanged(final Resource resource) {

-				for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) {

-					Resource nextResource = (Resource) it.next();

-					nextResource.unload();

-				}

-				if (myViewer != null) {

-					myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable);

-				}

-				return true;

-			}

-

-			public boolean handleResourceDeleted(Resource resource) {

-				for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) {

-					Resource nextResource = (Resource) it.next();

-					nextResource.unload();

-				}

-				if (myViewer != null) {

-					myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable);

-				}

-				return true;

-			}

-

-			public boolean handleResourceMoved(Resource resource, final URI newURI) {

-				for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) {

-					Resource nextResource = (Resource) it.next();

-					nextResource.unload();

-				}

-				if (myViewer != null) {

-					myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable);

-				}

-				return true;

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	public void dispose() {

-		myWorkspaceSynchronizer.dispose();

-		myWorkspaceSynchronizer = null;

-		myViewerRefreshRunnable = null;

-

-		for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) {

-			Resource resource = (Resource) it.next();

-			resource.unload();

-		}

-

-		((TransactionalEditingDomain) myEditingDomain).dispose();

-		myEditingDomain = null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		myViewer = viewer;

-	}

-

-	/**

-	 * @generated

-	 */

-	void unloadAllResources() {

-		for (Resource nextResource : myEditingDomain.getResourceSet().getResources()) {

-			nextResource.unload();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	void asyncRefresh() {

-		if (myViewer != null && !myViewer.getControl().isDisposed()) {

-			myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public Object[] getElements(Object inputElement) {

-		return getChildren(inputElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	public void restoreState(IMemento aMemento) {

-	}

-

-	/**

-	 * @generated

-	 */

-	public void saveState(IMemento aMemento) {

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init(ICommonContentExtensionSite aConfig) {

-	}

-

-	/**

-	 * @generated

-	 */

-	public Object[] getChildren(Object parentElement) {

-		if (parentElement instanceof IFile) {

-			IFile file = (IFile) parentElement;

-			URI fileURI = URI.createPlatformResourceURI(file.getFullPath().toString(), true);

-			Resource resource = myEditingDomain.getResourceSet().getResource(fileURI, true);

-			Collection<Object> result = new ArrayList<Object>();

-			List<View> topViews = new ArrayList<View>(resource.getContents().size());

-			for (EObject o : resource.getContents()) {

-				if (o instanceof View) {

-					topViews.add((View) o);

-				}

-			}

-			return result.toArray();

-		}

-

-		if (parentElement instanceof UMLNavigatorGroup) {

-			UMLNavigatorGroup group = (UMLNavigatorGroup) parentElement;

-			return group.getChildren();

-		}

-

-		if (parentElement instanceof UMLNavigatorItem) {

-			UMLNavigatorItem navigatorItem = (UMLNavigatorItem) parentElement;

-			if (navigatorItem.isLeaf() || !isOwnView(navigatorItem.getView())) {

-				return EMPTY_ARRAY;

-			}

-			return getViewChildren(navigatorItem.getView(), parentElement);

-		}

-

-		return EMPTY_ARRAY;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Object[] getViewChildren(View view, Object parentElement) {

-		switch (UMLVisualIDRegistry.getVisualID(view)) {

-		}

-		return EMPTY_ARRAY;

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isOwnView(View view) {

-		return ModelEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view));

-	}

-

-	/**

-	 * @generated

-	 */

-	public Object getParent(Object element) {

-		if (element instanceof UMLAbstractNavigatorItem) {

-			UMLAbstractNavigatorItem abstractNavigatorItem = (UMLAbstractNavigatorItem) element;

-			return abstractNavigatorItem.getParent();

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean hasChildren(Object element) {

-		return element instanceof IFile || getChildren(element).length > 0;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorGroup.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorGroup.java
deleted file mode 100644
index 37d89e7a2c9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorGroup.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.navigator;

-

-import java.util.Collection;

-import java.util.LinkedList;

-

-/**

- * @generated

- */

-public class UMLNavigatorGroup extends UMLAbstractNavigatorItem {

-

-	/**

-	 * @generated

-	 */

-	private String myGroupName;

-

-	/**

-	 * @generated

-	 */

-	private String myIcon;

-

-	/**

-	 * @generated

-	 */

-	private Collection<java.lang.Object> myChildren = new LinkedList<java.lang.Object>();

-

-	/**

-	 * @generated

-	 */

-	UMLNavigatorGroup(String groupName, String icon, Object parent) {

-		super(parent);

-		myGroupName = groupName;

-		myIcon = icon;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getGroupName() {

-		return myGroupName;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getIcon() {

-		return myIcon;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Object[] getChildren() {

-		return myChildren.toArray();

-	}

-

-	/**

-	 * @generated

-	 */

-	public void addChildren(Collection<java.lang.Object> children) {

-		myChildren.addAll(children);

-	}

-

-	/**

-	 * @generated

-	 */

-	public void addChild(Object child) {

-		myChildren.add(child);

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean isEmpty() {

-		return myChildren.size() == 0;

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean equals(Object obj) {

-		if (obj instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorGroup) {

-			org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorGroup anotherGroup = (org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorGroup) obj;

-			if (getGroupName().equals(anotherGroup.getGroupName())) {

-				return getParent().equals(anotherGroup.getParent());

-			}

-		}

-		return super.equals(obj);

-	}

-

-	/**

-	 * @generated

-	 */

-	public int hashCode() {

-		return getGroupName().hashCode();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorItem.java
deleted file mode 100644
index 18493251a92..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorItem.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.navigator;

-

-import org.eclipse.core.runtime.IAdapterFactory;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.gmf.runtime.notation.View;

-

-/**

- * @generated

- */

-public class UMLNavigatorItem extends UMLAbstractNavigatorItem {

-

-	/**

-	 * @generated

-	 */

-	static {

-		@SuppressWarnings("rawtypes")

-		final Class[] supportedTypes = new Class[] { View.class, EObject.class };

-		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

-

-			@SuppressWarnings("rawtypes")

-			public Object getAdapter(Object adaptableObject, Class adapterType) {

-				if (adaptableObject instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem && (adapterType == View.class || adapterType == EObject.class)) {

-					return ((org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem) adaptableObject).getView();

-				}

-				return null;

-			}

-

-			@SuppressWarnings("rawtypes")

-			public Class[] getAdapterList() {

-				return supportedTypes;

-			}

-		}, org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem.class);

-	}

-

-	/**

-	 * @generated

-	 */

-	private View myView;

-

-	/**

-	 * @generated

-	 */

-	private boolean myLeaf = false;

-

-	/**

-	 * @generated

-	 */

-	public UMLNavigatorItem(View view, Object parent, boolean isLeaf) {

-		super(parent);

-		myView = view;

-		myLeaf = isLeaf;

-	}

-

-	/**

-	 * @generated

-	 */

-	public View getView() {

-		return myView;

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean isLeaf() {

-		return myLeaf;

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean equals(Object obj) {

-		if (obj instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem) {

-			return EcoreUtil.getURI(getView()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem) obj).getView()));

-		}

-		return super.equals(obj);

-	}

-

-	/**

-	 * @generated

-	 */

-	public int hashCode() {

-		return EcoreUtil.getURI(getView()).hashCode();

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLabelProvider.java
deleted file mode 100644
index 3a48cf4b12e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLabelProvider.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.navigator;

-

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.resource.ImageRegistry;

-import org.eclipse.jface.viewers.ITreePathLabelProvider;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.viewers.TreePath;

-import org.eclipse.jface.viewers.ViewerLabel;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.ui.IMemento;

-import org.eclipse.ui.navigator.ICommonContentExtensionSite;

-import org.eclipse.ui.navigator.ICommonLabelProvider;

-

-/**

- * @generated

- */

-public class UMLNavigatorLabelProvider extends LabelProvider implements ICommonLabelProvider, ITreePathLabelProvider {

-

-	/**

-	 * @generated

-	 */

-	static {

-		UMLDiagramEditorPlugin.getInstance().getImageRegistry().put("Navigator?UnknownElement", ImageDescriptor.getMissingImageDescriptor()); //$NON-NLS-1$

-		UMLDiagramEditorPlugin.getInstance().getImageRegistry().put("Navigator?ImageNotFound", ImageDescriptor.getMissingImageDescriptor()); //$NON-NLS-1$

-	}

-

-	/**

-	 * @generated

-	 */

-	public void updateLabel(ViewerLabel label, TreePath elementPath) {

-		Object element = elementPath.getLastSegment();

-		if (element instanceof UMLNavigatorItem && !isOwnView(((UMLNavigatorItem) element).getView())) {

-			return;

-		}

-		label.setText(getText(element));

-		label.setImage(getImage(element));

-	}

-

-	/**

-	 * @generated

-	 */

-	public Image getImage(Object element) {

-		if (element instanceof UMLNavigatorGroup) {

-			UMLNavigatorGroup group = (UMLNavigatorGroup) element;

-			return UMLDiagramEditorPlugin.getInstance().getBundledImage(group.getIcon());

-		}

-

-		if (element instanceof UMLNavigatorItem) {

-			UMLNavigatorItem navigatorItem = (UMLNavigatorItem) element;

-			if (!isOwnView(navigatorItem.getView())) {

-				return super.getImage(element);

-			}

-			return getImage(navigatorItem.getView());

-		}

-

-		return super.getImage(element);

-	}

-

-	/**

-	 * @generated

-	 */

-	public Image getImage(View view) {

-		return getImage("Navigator?UnknownElement", null); //$NON-NLS-1$

-	}

-

-	/**

-	 * @generated

-	 */

-	private Image getImage(String key, IElementType elementType) {

-		ImageRegistry imageRegistry = UMLDiagramEditorPlugin.getInstance().getImageRegistry();

-		Image image = imageRegistry.get(key);

-		if (image == null && elementType != null && UMLElementTypes.isKnownElementType(elementType)) {

-			image = UMLElementTypes.getImage(elementType);

-			imageRegistry.put(key, image);

-		}

-

-		if (image == null) {

-			image = imageRegistry.get("Navigator?ImageNotFound"); //$NON-NLS-1$

-			imageRegistry.put(key, image);

-		}

-		return image;

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getText(Object element) {

-		if (element instanceof UMLNavigatorGroup) {

-			UMLNavigatorGroup group = (UMLNavigatorGroup) element;

-			return group.getGroupName();

-		}

-

-		if (element instanceof UMLNavigatorItem) {

-			UMLNavigatorItem navigatorItem = (UMLNavigatorItem) element;

-			if (!isOwnView(navigatorItem.getView())) {

-				return null;

-			}

-			return getText(navigatorItem.getView());

-		}

-

-		return super.getText(element);

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getText(View view) {

-		if (view.getElement() != null && view.getElement().eIsProxy()) {

-			return getUnresolvedDomainElementProxyText(view);

-		}

-		return getUnknownElementText(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	private String getUnknownElementText(View view) {

-		return "<UnknownElement Visual_ID = " + view.getType() + ">"; //$NON-NLS-1$  //$NON-NLS-2$

-	}

-

-	/**

-	 * @generated

-	 */

-	private String getUnresolvedDomainElementProxyText(View view) {

-		return "<Unresolved domain element Visual_ID = " + view.getType() + ">"; //$NON-NLS-1$  //$NON-NLS-2$

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init(ICommonContentExtensionSite aConfig) {

-	}

-

-	/**

-	 * @generated

-	 */

-	public void restoreState(IMemento aMemento) {

-	}

-

-	/**

-	 * @generated

-	 */

-	public void saveState(IMemento aMemento) {

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getDescription(Object anElement) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isOwnView(View view) {

-		return ModelEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view));

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLinkHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLinkHelper.java
deleted file mode 100644
index e9bb2e5e05a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLinkHelper.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.navigator;

-

-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.EcoreUtil;

-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.GraphicalViewer;

-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;

-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.navigator.ILinkHelper;

-import org.eclipse.ui.part.FileEditorInput;

-

-/**

- * @generated

- */

-public class UMLNavigatorLinkHelper implements ILinkHelper {

-

-	/**

-	 * @generated

-	 */

-	private static IEditorInput getEditorInput(Diagram diagram) {

-		Resource diagramResource = diagram.eResource();

-		for (EObject nextEObject : diagramResource.getContents()) {

-			if (nextEObject == diagram) {

-				return new FileEditorInput(WorkspaceSynchronizer.getFile(diagramResource));

-			}

-			if (nextEObject instanceof Diagram) {

-				break;

-			}

-		}

-		URI uri = EcoreUtil.getURI(diagram);

-		String editorName = uri.lastSegment() + '#' + diagram.eResource().getContents().indexOf(diagram);

-		IEditorInput editorInput = new URIEditorInput(uri, editorName);

-		return editorInput;

-	}

-

-	/**

-	 * @generated

-	 */

-	public IStructuredSelection findSelection(IEditorInput anInput) {

-		IDiagramDocument document = UMLDiagramEditorPlugin.getInstance().getDocumentProvider().getDiagramDocument(anInput);

-		return StructuredSelection.EMPTY;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void activateEditor(IWorkbenchPage aPage, IStructuredSelection aSelection) {

-		if (aSelection == null || aSelection.isEmpty()) {

-			return;

-		}

-		if (false == aSelection.getFirstElement() instanceof UMLAbstractNavigatorItem) {

-			return;

-		}

-

-		UMLAbstractNavigatorItem abstractNavigatorItem = (UMLAbstractNavigatorItem) aSelection.getFirstElement();

-		View navigatorView = null;

-		if (abstractNavigatorItem instanceof UMLNavigatorItem) {

-			navigatorView = ((UMLNavigatorItem) abstractNavigatorItem).getView();

-		} else if (abstractNavigatorItem instanceof UMLNavigatorGroup) {

-			UMLNavigatorGroup navigatorGroup = (UMLNavigatorGroup) abstractNavigatorItem;

-			if (navigatorGroup.getParent() instanceof UMLNavigatorItem) {

-				navigatorView = ((UMLNavigatorItem) navigatorGroup.getParent()).getView();

-			}

-		}

-		if (navigatorView == null) {

-			return;

-		}

-		IEditorInput editorInput = getEditorInput(navigatorView.getDiagram());

-		IEditorPart editor = aPage.findEditor(editorInput);

-		if (editor == null) {

-			return;

-		}

-		aPage.bringToTop(editor);

-		if (editor instanceof DiagramEditor) {

-			DiagramEditor diagramEditor = (DiagramEditor) editor;

-			ResourceSet diagramEditorResourceSet = diagramEditor.getEditingDomain().getResourceSet();

-			EObject selectedView = diagramEditorResourceSet.getEObject(EcoreUtil.getURI(navigatorView), true);

-			if (selectedView == null) {

-				return;

-			}

-			GraphicalViewer graphicalViewer = (GraphicalViewer) diagramEditor.getAdapter(GraphicalViewer.class);

-			EditPart selectedEditPart = (EditPart) graphicalViewer.getEditPartRegistry().get(selectedView);

-			if (selectedEditPart != null) {

-				graphicalViewer.select(selectedEditPart);

-			}

-		}

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorSorter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorSorter.java
deleted file mode 100644
index 619682015bd..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorSorter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.navigator;

-

-import org.eclipse.jface.viewers.ViewerSorter;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-

-/**

- * @generated

- */

-public class UMLNavigatorSorter extends ViewerSorter {

-

-	/**

-	 * @generated

-	 */

-	private static final int GROUP_CATEGORY = 8502;

-

-	/**

-	 * @generated

-	 */

-	public int category(Object element) {

-		if (element instanceof UMLNavigatorItem) {

-			UMLNavigatorItem item = (UMLNavigatorItem) element;

-			return UMLVisualIDRegistry.getVisualID(item.getView());

-		}

-		return GROUP_CATEGORY;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/parsers/AbstractParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/parsers/AbstractParser.java
deleted file mode 100644
index 663b3700530..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/parsers/AbstractParser.java
+++ /dev/null
@@ -1 +0,0 @@
-//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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/parsers/MessageFormatParser.java
deleted file mode 100644
index 92750746694..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/parsers/MessageFormatParser.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.part.Messages;

-import org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/DiagramEditorContextMenuProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/DiagramEditorContextMenuProvider.java
deleted file mode 100644
index b171367c1f2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/DiagramEditorContextMenuProvider.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/LoadResourceAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/LoadResourceAction.java
deleted file mode 100644
index 0aefb56bdeb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/LoadResourceAction.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/Messages.java
deleted file mode 100644
index 05cb6736b2b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/Messages.java
+++ /dev/null
@@ -1,985 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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 Nodes1Group_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Nodes1Group_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Edges2Group_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Edges2Group_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Class1CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Class1CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String ClassifierTemplateParameter2CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ClassifierTemplateParameter2CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Comment5CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Comment5CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Component4CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Component4CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Constraint5CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Constraint5CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String DataType6CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String DataType6CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String DurationObservation7CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String DurationObservation7CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Enumeration8CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Enumeration8CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Enumerationliteral9CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Enumerationliteral9CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Interface10CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Interface10CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String InstanceSpecification11CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String InstanceSpecification11CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String InformationItem12CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String InformationItem12CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String PrimitiveType13CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String PrimitiveType13CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Model14CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Model14CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Operation15CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Operation15CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String OperationTemplateParameterCreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String OperationTemplateParameterCreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Package17CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Package17CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Property18CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Property18CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Reception19CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Reception19CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String RedefinableTemplateSignature20CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String RedefinableTemplateSignature20CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Signal21CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Signal21CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Slot22CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Slot22CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String TemplateParameter23CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String TemplateParameter23CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String TemplateSignatureCreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String TemplateSignatureCreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String TimeObservation22CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String TimeObservation22CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String ConnectableElementTemplateParameter26CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ConnectableElementTemplateParameter26CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Abstraction1CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Abstraction1CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Association2CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Association2CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String AssociationBranch3CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String AssociationBranch3CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String AssociationClass4CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String AssociationClass4CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String ContainmentLink5CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ContainmentLink5CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Dependency6CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Dependency6CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String DependencyBranch7CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String DependencyBranch7CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String ElementImport8CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ElementImport8CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Generalization9CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Generalization9CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String GeneralizationSet10CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String GeneralizationSet10CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String InformationFlowLinkCreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String InformationFlowLinkCreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String InstanceSpecificationLinkCreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String InstanceSpecificationLinkCreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String InterfaceRealization13CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String InterfaceRealization13CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Link14CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Link14CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String PackageImport15CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String PackageImport15CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String PackageMerge16CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String PackageMerge16CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String ProfileApplication17CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ProfileApplication17CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Realization18CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Realization18CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Substitution19CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Substitution19CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String Usage20CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String Usage20CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String TemplateBinding21CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String TemplateBinding21CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String ContextLink22CreationTool_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ContextLink22CreationTool_desc;

-

-	/**

-	 * @generated

-	 */

-	public static String ClassAttributeCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ClassOperationCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ClassNestedClassifierCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ComponentAttributeCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ComponentOperationCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ComponentNestedClassifierCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String SignalAttributeCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String InterfaceAttributeCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String InterfaceOperationCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String InterfaceNestedClassifierCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String PrimitiveTypeAttributeCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String PrimitiveTypeOperationCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String DataTypeAttributeCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String DataTypeOperationCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ModelPackageableElementCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String PackagePackageableElementCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String EnumerationEnumerationLiteralCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String InstanceSpecificationSlotCompartmentEditPartCN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ClassAttributeCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ClassOperationCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ClassNestedClassifierCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ComponentAttributeCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ComponentOperationCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ComponentNestedClassifierCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String InterfaceAttributeCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String InterfaceOperationCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String InterfaceNestedClassifierCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String PrimitiveTypeAttributeCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String PrimitiveTypeOperationCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String DataTypeAttributeCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String DataTypeOperationCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String AssociationClassAttributeCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String InstanceSpecificationSlotCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String SignalAttributeCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String ModelPackageableElementCompartmentEditPartTN_title;

-

-	/**

-	 * @generated

-	 */

-	public static String PackagePackageableElementCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String EnumerationEnumerationLiteralCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String AssociationClassOperationCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String AssociationClassNestedClassifierCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String RedefinableTemplateSignatureTemplateParameterCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String TemplateSignatureTemplateParameterCompartmentEditPart_title;

-

-	/**

-	 * @generated

-	 */

-	public static String CommandName_OpenDiagram;

-

-	/**

-	 * @generated

-	 */

-	public static String NavigatorActionProvider_OpenDiagramActionName;

-

-	/**

-	 * @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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/ModelElementSelectionPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/ModelElementSelectionPage.java
deleted file mode 100644
index 8d3bd7e0b36..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/ModelElementSelectionPage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizard.java
deleted file mode 100644
index 0a689818a15..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizard.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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(), "PapyrusUMLClass_diagram"); //$NON-NLS-1$ //$NON-NLS-2$

-		diagramModelFilePage.setTitle(Messages.UMLCreationWizard_DiagramModelFilePageTitle);

-		diagramModelFilePage.setDescription(Messages.UMLCreationWizard_DiagramModelFilePageDescription);

-		addPage(diagramModelFilePage);

-

-		domainModelFilePage = new UMLCreationWizardPage("DomainModelFile", getSelection(), "PapyrusUMLClass") { //$NON-NLS-1$ //$NON-NLS-2$

-

-			public void setVisible(boolean visible) {

-				if (visible) {

-					String fileName = diagramModelFilePage.getFileName();

-					fileName = fileName.substring(0, fileName.length() - ".PapyrusUMLClass_diagram".length()); //$NON-NLS-1$

-					setFileName(UMLDiagramEditorUtil.getUniqueFileName(

-							getContainerFullPath(), fileName, "PapyrusUMLClass")); //$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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizardPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizardPage.java
deleted file mode 100644
index dab2fac412e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizardPage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramActionBarContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramActionBarContributor.java
deleted file mode 100644
index e44973934c7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramActionBarContributor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditor.java
deleted file mode 100644
index 735b523fb2e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditor.java
+++ /dev/null
@@ -1,523 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.part;

-

-import java.util.EventObject;

-

-import org.eclipse.core.commands.operations.IUndoableOperation;

-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.IDiagramDocument;

-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.jface.viewers.StructuredSelection;

-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.navigator.resources.ProjectExplorer;

-import org.eclipse.ui.part.IShowInTargetList;

-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.clazz.part.UMLDiagramEditorID"; //$NON-NLS-1$

-

-	/**

-	 * @generated

-	 */

-	public static final String CONTEXT_ID = "org.eclipse.papyrus.uml.diagram.clazz.ui.diagramContext"; //$NON-NLS-1$

-

-	/**

-	 * @generated

-	 */

-	private KeyHandler paletteKeyHandler = null;

-

-	/**

-	 * @generated

-	 */

-	private MouseListener paletteMouseListener = null;

-

-	/**

-	 * @generated

-	 */

-	private IUndoableOperation savedOperation = null;

-

-	/**

-	 * @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

-	 */

-	@SuppressWarnings("rawtypes")

-	public Object getAdapter(Class type) {

-		if (type == IShowInTargetList.class) {

-			return new IShowInTargetList() {

-				public String[] getShowInTargetIds() {

-					return new String[] { ProjectExplorer.VIEW_ID };

-				}

-			};

-		}

-		return super.getAdapter(type);

-	}

-

-	/**

-	 * @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(), getNavigatorSelection());

-	}

-

-	/**

-	 * @generated

-	 */

-	private ISelection getNavigatorSelection() {

-		IDiagramDocument document = getDiagramDocument();

-		return StructuredSelection.EMPTY;

-	}

-

-	/**

-	 * @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

-		savedOperation = getOperationHistory().getUndoOperation(getUndoContext());

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean isDirty() {

-		IUndoableOperation op = getOperationHistory().getUndoOperation(getUndoContext());

-		return savedOperation != op;

-	}

-

-	/**

-	 * @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);

-

-		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) {

-						return LocalSelectionTransfer.getTransfer().nativeToJava(data);

-					}

-

-					@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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorPlugin.java
deleted file mode 100644
index db27721fd0b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorPlugin.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.expressions.UMLOCLFactory;

-import org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramPreferenceInitializer;

-import org.eclipse.papyrus.uml.diagram.clazz.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.clazz"; //$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

-	 */

-	private UMLOCLFactory oclFactory;

-

-	/**

-	 * @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;

-		oclFactory = 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 UMLOCLFactory getUMLOCLFactory() {

-		return oclFactory;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setUMLOCLFactory(UMLOCLFactory f) {

-		this.oclFactory = f;

-	}

-

-	/**

-	 * @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();

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorUtil.java
deleted file mode 100644
index a25eb6b4f28..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorUtil.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.parts.ModelEditPart;

-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,

-						ModelEditPart.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.clazz.part.UMLDiagramEditorUtil.getSaveOptions());

-					diagramResource.save(org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdateCommand.java
deleted file mode 100644
index 3285e8e05f4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdateCommand.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java
deleted file mode 100644
index c2d1e1008eb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java
+++ /dev/null
@@ -1,9441 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.part;

-

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.update.DiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.*;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.uml2.uml.Abstraction;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.AssociationClass;

-import org.eclipse.uml2.uml.BehavioredClassifier;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.Component;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.DurationObservation;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.ElementImport;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-import org.eclipse.uml2.uml.Generalization;

-import org.eclipse.uml2.uml.GeneralizationSet;

-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.Model;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.Operation;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.PackageImport;

-import org.eclipse.uml2.uml.PackageMerge;

-import org.eclipse.uml2.uml.PackageableElement;

-import org.eclipse.uml2.uml.PrimitiveType;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.ProfileApplication;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Realization;

-import org.eclipse.uml2.uml.Reception;

-import org.eclipse.uml2.uml.RedefinableTemplateSignature;

-import org.eclipse.uml2.uml.Signal;

-import org.eclipse.uml2.uml.Slot;

-import org.eclipse.uml2.uml.Substitution;

-import org.eclipse.uml2.uml.TemplateBinding;

-import org.eclipse.uml2.uml.TemplateParameter;

-import org.eclipse.uml2.uml.TemplateSignature;

-import org.eclipse.uml2.uml.TemplateableElement;

-import org.eclipse.uml2.uml.TimeObservation;

-import org.eclipse.uml2.uml.Type;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.Usage;

-

-/**

- * @generated

- */

-public class UMLDiagramUpdater {

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getSemanticChildren(View view) {

-		switch (UMLVisualIDRegistry.getVisualID(view)) {

-		case ModelEditPart.VISUAL_ID:

-			return getPackage_1000SemanticChildren(view);

-		case ComponentEditPart.VISUAL_ID:

-			return getComponent_2002SemanticChildren(view);

-		case SignalEditPart.VISUAL_ID:

-			return getSignal_2003SemanticChildren(view);

-		case InterfaceEditPart.VISUAL_ID:

-			return getInterface_2004SemanticChildren(view);

-		case ModelEditPartTN.VISUAL_ID:

-			return getModel_2005SemanticChildren(view);

-		case PackageEditPart.VISUAL_ID:

-			return getPackage_2007SemanticChildren(view);

-		case ClassEditPart.VISUAL_ID:

-			return getClass_2008SemanticChildren(view);

-		case DataTypeEditPart.VISUAL_ID:

-			return getDataType_2010SemanticChildren(view);

-		case ComponentEditPartCN.VISUAL_ID:

-			return getComponent_3021SemanticChildren(view);

-		case SignalEditPartCN.VISUAL_ID:

-			return getSignal_3022SemanticChildren(view);

-		case InterfaceEditPartCN.VISUAL_ID:

-			return getInterface_3023SemanticChildren(view);

-		case ModelEditPartCN.VISUAL_ID:

-			return getModel_3024SemanticChildren(view);

-		case PackageEditPartCN.VISUAL_ID:

-			return getPackage_3009SemanticChildren(view);

-		case ClassEditPartCN.VISUAL_ID:

-			return getClass_3010SemanticChildren(view);

-		case DataTypeEditPartCN.VISUAL_ID:

-			return getDataType_3027SemanticChildren(view);

-		case ClassAttributeCompartmentEditPartCN.VISUAL_ID:

-			return getClassAttributes_7011SemanticChildren(view);

-		case ClassOperationCompartmentEditPartCN.VISUAL_ID:

-			return getClassOperations_7012SemanticChildren(view);

-		case ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-			return getClassNestedclassifiers_7013SemanticChildren(view);

-		case ComponentAttributeCompartmentEditPartCN.VISUAL_ID:

-			return getComponentAttributes_7023SemanticChildren(view);

-		case ComponentOperationCompartmentEditPartCN.VISUAL_ID:

-			return getComponentOperations_7024SemanticChildren(view);

-		case ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-			return getComponentNestedclassifiers_7025SemanticChildren(view);

-		case SignalAttributeCompartmentEditPartCN.VISUAL_ID:

-			return getSignalAttributes_7026SemanticChildren(view);

-		case InterfaceAttributeCompartmentEditPartCN.VISUAL_ID:

-			return getInterfaceAttributes_7027SemanticChildren(view);

-		case InterfaceOperationCompartmentEditPartCN.VISUAL_ID:

-			return getInterfaceOperations_7028SemanticChildren(view);

-		case InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-			return getInterfaceNestedclassifiers_7029SemanticChildren(view);

-		case PrimitiveTypeAttributeCompartmentEditPartCN.VISUAL_ID:

-			return getPrimitiveTypeAttributes_7041SemanticChildren(view);

-		case PrimitiveTypeOperationCompartmentEditPartCN.VISUAL_ID:

-			return getPrimitiveTypeOperations_7042SemanticChildren(view);

-		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

-			return getDataTypeAttributes_7032SemanticChildren(view);

-		case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:

-			return getDataTypeOperations_7033SemanticChildren(view);

-		case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID:

-			return getModelPackagedelements_7030SemanticChildren(view);

-		case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID:

-			return getPackagePackagedelements_7010SemanticChildren(view);

-		case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:

-			return getEnumerationEnumerationLiteralCompartment_7031SemanticChildren(view);

-		case InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID:

-			return getInstanceSpecificationSlots_7035SemanticChildren(view);

-		case ClassAttributeCompartmentEditPart.VISUAL_ID:

-			return getClassAttributes_7017SemanticChildren(view);

-		case ClassOperationCompartmentEditPart.VISUAL_ID:

-			return getClassOperations_7018SemanticChildren(view);

-		case ClassNestedClassifierCompartmentEditPart.VISUAL_ID:

-			return getClassNestedclassifiers_7019SemanticChildren(view);

-		case ComponentAttributeCompartmentEditPart.VISUAL_ID:

-			return getComponentAttributes_7002SemanticChildren(view);

-		case ComponentOperationCompartmentEditPart.VISUAL_ID:

-			return getComponentOperations_7003SemanticChildren(view);

-		case ComponentNestedClassifierCompartmentEditPart.VISUAL_ID:

-			return getComponentNestedclassifiers_7004SemanticChildren(view);

-		case InterfaceAttributeCompartmentEditPart.VISUAL_ID:

-			return getInterfaceAttributes_7006SemanticChildren(view);

-		case InterfaceOperationCompartmentEditPart.VISUAL_ID:

-			return getInterfaceOperations_7007SemanticChildren(view);

-		case InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID:

-			return getInterfaceNestedclassifiers_7008SemanticChildren(view);

-		case PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID:

-			return getPrimitiveTypeAttributes_7039SemanticChildren(view);

-		case PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID:

-			return getPrimitiveTypeOperations_7040SemanticChildren(view);

-		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

-			return getDataTypeAttributes_7020SemanticChildren(view);

-		case DataTypeOperationCompartmentEditPart.VISUAL_ID:

-			return getDataTypeOperations_7021SemanticChildren(view);

-		case AssociationClassAttributeCompartmentEditPart.VISUAL_ID:

-			return getAssociationClassAttributes_7034SemanticChildren(view);

-		case InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID:

-			return getInstanceSpecificationSlots_7001SemanticChildren(view);

-		case SignalAttributeCompartmentEditPart.VISUAL_ID:

-			return getSignalAttributes_7005SemanticChildren(view);

-		case ModelPackageableElementCompartmentEditPartTN.VISUAL_ID:

-			return getModelPackagedelements_7009SemanticChildren(view);

-		case PackagePackageableElementCompartmentEditPart.VISUAL_ID:

-			return getPackagePackagedelements_7016SemanticChildren(view);

-		case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:

-			return getEnumerationEnumerationLiteralCompartment_7015SemanticChildren(view);

-		case AssociationClassOperationCompartmentEditPart.VISUAL_ID:

-			return getAssociationClassOperations_7036SemanticChildren(view);

-		case AssociationClassNestedClassifierCompartmentEditPart.VISUAL_ID:

-			return getAssociationClassNestedclassifiers_7037SemanticChildren(view);

-		case RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID:

-			return getRedefinableTemplateSignatureTemplateParameterCompartment_7014SemanticChildren(view);

-		case TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID:

-			return getTemplateSignatureTemplateParameterCompartment_7038SemanticChildren(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 == DependencyNodeEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == AssociationClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == AssociationNodeEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == InstanceSpecificationEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == SignalEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == InterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ModelEditPartTN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == EnumerationEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == PackageEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == InformationItemEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == PrimitiveTypeEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == DataTypeEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ConstraintEditPart.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 == DefaultNamedElementEditPart.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;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getComponent_2002SemanticChildren(View view) {

-		if (!view.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Component modelElement = (Component) view.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		{

-			TemplateSignature childElement = modelElement.getOwnedTemplateSignature();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getSignal_2003SemanticChildren(View view) {

-		if (!view.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Signal modelElement = (Signal) view.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		{

-			TemplateSignature childElement = modelElement.getOwnedTemplateSignature();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getInterface_2004SemanticChildren(View view) {

-		if (!view.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Interface modelElement = (Interface) view.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		{

-			TemplateSignature childElement = modelElement.getOwnedTemplateSignature();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getModel_2005SemanticChildren(View view) {

-		if (!view.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Model modelElement = (Model) view.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		{

-			TemplateSignature childElement = modelElement.getOwnedTemplateSignature();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-			if (visualID == TemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getPackage_2007SemanticChildren(View view) {

-		if (!view.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Package modelElement = (Package) view.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		{

-			TemplateSignature childElement = modelElement.getOwnedTemplateSignature();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-			if (visualID == TemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getClass_2008SemanticChildren(View view) {

-		if (!view.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Class modelElement = (Class) view.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		{

-			TemplateSignature childElement = modelElement.getOwnedTemplateSignature();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getDataType_2010SemanticChildren(View view) {

-		if (!view.isSetElement()) {

-			return Collections.emptyList();

-		}

-		DataType modelElement = (DataType) view.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		{

-			TemplateSignature childElement = modelElement.getOwnedTemplateSignature();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getComponent_3021SemanticChildren(View view) {

-		if (!view.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Component modelElement = (Component) view.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		{

-			TemplateSignature childElement = modelElement.getOwnedTemplateSignature();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getSignal_3022SemanticChildren(View view) {

-		if (!view.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Signal modelElement = (Signal) view.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		{

-			TemplateSignature childElement = modelElement.getOwnedTemplateSignature();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getInterface_3023SemanticChildren(View view) {

-		if (!view.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Interface modelElement = (Interface) view.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		{

-			TemplateSignature childElement = modelElement.getOwnedTemplateSignature();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getModel_3024SemanticChildren(View view) {

-		if (!view.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Model modelElement = (Model) view.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		{

-			TemplateSignature childElement = modelElement.getOwnedTemplateSignature();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-			if (visualID == TemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getPackage_3009SemanticChildren(View view) {

-		if (!view.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Package modelElement = (Package) view.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		{

-			TemplateSignature childElement = modelElement.getOwnedTemplateSignature();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-			if (visualID == TemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getClass_3010SemanticChildren(View view) {

-		if (!view.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Class modelElement = (Class) view.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		{

-			TemplateSignature childElement = modelElement.getOwnedTemplateSignature();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getDataType_3027SemanticChildren(View view) {

-		if (!view.isSetElement()) {

-			return Collections.emptyList();

-		}

-		DataType modelElement = (DataType) view.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		{

-			TemplateSignature childElement = modelElement.getOwnedTemplateSignature();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == RedefinableTemplateSignatureEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getClassAttributes_7011SemanticChildren(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 == PropertyForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getClassOperations_7012SemanticChildren(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.getOwnedReceptions()

-				.iterator(); it.hasNext();) {

-			Reception childElement = (Reception) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ReceptionEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		for (Iterator<?> it = modelElement.getOwnedOperations()

-				.iterator(); it.hasNext();) {

-			Operation childElement = (Operation) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == OperationForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getClassNestedclassifiers_7013SemanticChildren(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.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == NestedClassForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedInterfaceForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedEnumerationForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedPrimitiveTypeForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedDataTypeForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedSignalForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getComponentAttributes_7023SemanticChildren(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 == PropertyForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getComponentOperations_7024SemanticChildren(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.getOwnedOperations()

-				.iterator(); it.hasNext();) {

-			Operation childElement = (Operation) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == OperationForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		for (Iterator<?> it = modelElement.getOwnedReceptions()

-				.iterator(); it.hasNext();) {

-			Reception childElement = (Reception) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ReceptionEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getComponentNestedclassifiers_7025SemanticChildren(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.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == NestedClassForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedInterfaceForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedEnumerationForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedPrimitiveTypeForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedDataTypeForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedSignalForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getSignalAttributes_7026SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Signal modelElement = (Signal) 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 == PropertyForSignalEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getInterfaceAttributes_7027SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Interface modelElement = (Interface) 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 == PropertyForInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getInterfaceOperations_7028SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Interface modelElement = (Interface) 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 == OperationForInterfaceEditpart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		for (Iterator<?> it = modelElement.getOwnedReceptions()

-				.iterator(); it.hasNext();) {

-			Reception childElement = (Reception) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ReceptionInInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getInterfaceNestedclassifiers_7029SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Interface modelElement = (Interface) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == NestedClassForInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedInterfaceForInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedEnumerationForInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedDataTypeForInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedSignalForInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getPrimitiveTypeAttributes_7041SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		PrimitiveType modelElement = (PrimitiveType) 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 == PropertyforPrimitiveTypeEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getPrimitiveTypeOperations_7042SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		PrimitiveType modelElement = (PrimitiveType) 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 == OperationForPrimitiveTypeEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getDataTypeAttributes_7032SemanticChildren(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 == PropertyforDataTypeEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getDataTypeOperations_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.getOwnedOperations()

-				.iterator(); it.hasNext();) {

-			Operation childElement = (Operation) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == OperationForDataTypeEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getModelPackagedelements_7030SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Model modelElement = (Model) containerView.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 == InstanceSpecificationEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ComponentEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ModelEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == PackageEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ClassEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == InformationItemEditPartCN.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;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getPackagePackagedelements_7010SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Package modelElement = (Package) containerView.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 == InstanceSpecificationEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ComponentEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ModelEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == PackageEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ClassEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == InformationItemEditPartCN.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;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getEnumerationEnumerationLiteralCompartment_7031SemanticChildren(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 == EnumerationLiteralEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getInstanceSpecificationSlots_7035SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		InstanceSpecification modelElement = (InstanceSpecification) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getSlots()

-				.iterator(); it.hasNext();) {

-			Slot childElement = (Slot) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == SlotEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getClassAttributes_7017SemanticChildren(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 == PropertyForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getClassOperations_7018SemanticChildren(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.getOwnedReceptions()

-				.iterator(); it.hasNext();) {

-			Reception childElement = (Reception) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ReceptionEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		for (Iterator<?> it = modelElement.getOwnedOperations()

-				.iterator(); it.hasNext();) {

-			Operation childElement = (Operation) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == OperationForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getClassNestedclassifiers_7019SemanticChildren(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.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == NestedClassForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedInterfaceForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedEnumerationForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedPrimitiveTypeForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedDataTypeForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedSignalForClassEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getComponentAttributes_7002SemanticChildren(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 == PropertyForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getComponentOperations_7003SemanticChildren(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.getOwnedOperations()

-				.iterator(); it.hasNext();) {

-			Operation childElement = (Operation) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == OperationForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		for (Iterator<?> it = modelElement.getOwnedReceptions()

-				.iterator(); it.hasNext();) {

-			Reception childElement = (Reception) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ReceptionEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getComponentNestedclassifiers_7004SemanticChildren(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.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == NestedClassForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedInterfaceForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedEnumerationForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedPrimitiveTypeForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedDataTypeForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedSignalForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getInterfaceAttributes_7006SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Interface modelElement = (Interface) 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 == PropertyForInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getInterfaceOperations_7007SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Interface modelElement = (Interface) 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 == OperationForInterfaceEditpart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		for (Iterator<?> it = modelElement.getOwnedReceptions()

-				.iterator(); it.hasNext();) {

-			Reception childElement = (Reception) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ReceptionInInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getInterfaceNestedclassifiers_7008SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Interface modelElement = (Interface) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == NestedClassForInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedInterfaceForInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedEnumerationForInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedDataTypeForInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == NestedSignalForInterfaceEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getPrimitiveTypeAttributes_7039SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		PrimitiveType modelElement = (PrimitiveType) 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 == PropertyforPrimitiveTypeEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getPrimitiveTypeOperations_7040SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		PrimitiveType modelElement = (PrimitiveType) 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 == OperationForPrimitiveTypeEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getDataTypeAttributes_7020SemanticChildren(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 == PropertyforDataTypeEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getDataTypeOperations_7021SemanticChildren(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 == OperationForDataTypeEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getAssociationClassAttributes_7034SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		AssociationClass modelElement = (AssociationClass) 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 == PropertyForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getInstanceSpecificationSlots_7001SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		InstanceSpecification modelElement = (InstanceSpecification) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getSlots()

-				.iterator(); it.hasNext();) {

-			Slot childElement = (Slot) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == SlotEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getSignalAttributes_7005SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Signal modelElement = (Signal) 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 == PropertyForSignalEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getModelPackagedelements_7009SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Model modelElement = (Model) containerView.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 == InstanceSpecificationEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ComponentEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ModelEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == PackageEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ClassEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == InformationItemEditPartCN.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;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getPackagePackagedelements_7016SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		Package modelElement = (Package) containerView.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 == InstanceSpecificationEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ComponentEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ModelEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == PackageEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ClassEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == InformationItemEditPartCN.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;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getEnumerationEnumerationLiteralCompartment_7015SemanticChildren(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 == EnumerationLiteralEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getAssociationClassOperations_7036SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		AssociationClass modelElement = (AssociationClass) 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 == OperationForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getAssociationClassNestedclassifiers_7037SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		AssociationClass modelElement = (AssociationClass) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == NestedClassForComponentEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getRedefinableTemplateSignatureTemplateParameterCompartment_7014SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		RedefinableTemplateSignature modelElement = (RedefinableTemplateSignature) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getParameters()

-				.iterator(); it.hasNext();) {

-			TemplateParameter childElement = (TemplateParameter) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ClassifierTemplateParameterEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == ConnectableElementTemplateParameterEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == OperationTemplateParameterEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == TemplateParameterEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLNodeDescriptor> getTemplateSignatureTemplateParameterCompartment_7038SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

-			return Collections.emptyList();

-		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

-			return Collections.emptyList();

-		}

-		TemplateSignature modelElement = (TemplateSignature) containerView.getElement();

-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getParameters()

-				.iterator(); it.hasNext();) {

-			TemplateParameter childElement = (TemplateParameter) it.next();

-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ClassifierTemplateParameterEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == OperationTemplateParameterEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-			if (visualID == TemplateParameterEditPart.VISUAL_ID) {

-				result.add(new UMLNodeDescriptor(childElement, visualID));

-				continue;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getContainedLinks(View view) {

-		switch (UMLVisualIDRegistry.getVisualID(view)) {

-		case ModelEditPart.VISUAL_ID:

-			return getPackage_1000ContainedLinks(view);

-		case DependencyNodeEditPart.VISUAL_ID:

-			return getDependency_2014ContainedLinks(view);

-		case AssociationClassEditPart.VISUAL_ID:

-			return getAssociationClass_2013ContainedLinks(view);

-		case AssociationNodeEditPart.VISUAL_ID:

-			return getAssociation_2015ContainedLinks(view);

-		case InstanceSpecificationEditPart.VISUAL_ID:

-			return getInstanceSpecification_2001ContainedLinks(view);

-		case ComponentEditPart.VISUAL_ID:

-			return getComponent_2002ContainedLinks(view);

-		case SignalEditPart.VISUAL_ID:

-			return getSignal_2003ContainedLinks(view);

-		case InterfaceEditPart.VISUAL_ID:

-			return getInterface_2004ContainedLinks(view);

-		case ModelEditPartTN.VISUAL_ID:

-			return getModel_2005ContainedLinks(view);

-		case EnumerationEditPart.VISUAL_ID:

-			return getEnumeration_2006ContainedLinks(view);

-		case PackageEditPart.VISUAL_ID:

-			return getPackage_2007ContainedLinks(view);

-		case InformationItemEditPart.VISUAL_ID:

-			return getInformationItem_2099ContainedLinks(view);

-		case ClassEditPart.VISUAL_ID:

-			return getClass_2008ContainedLinks(view);

-		case PrimitiveTypeEditPart.VISUAL_ID:

-			return getPrimitiveType_2009ContainedLinks(view);

-		case DataTypeEditPart.VISUAL_ID:

-			return getDataType_2010ContainedLinks(view);

-		case ConstraintEditPart.VISUAL_ID:

-			return getConstraint_2011ContainedLinks(view);

-		case CommentEditPart.VISUAL_ID:

-			return getComment_2012ContainedLinks(view);

-		case ShortCutDiagramEditPart.VISUAL_ID:

-			return getDiagram_2016ContainedLinks(view);

-		case DurationObservationEditPart.VISUAL_ID:

-			return getDurationObservation_2095ContainedLinks(view);

-		case TimeObservationEditPart.VISUAL_ID:

-			return getTimeObservation_2096ContainedLinks(view);

-		case DefaultNamedElementEditPart.VISUAL_ID:

-			return getNamedElement_2097ContainedLinks(view);

-		case PropertyForClassEditPart.VISUAL_ID:

-			return getProperty_3012ContainedLinks(view);

-		case PropertyForComponentEditPart.VISUAL_ID:

-			return getProperty_3002ContainedLinks(view);

-		case PropertyForSignalEditPart.VISUAL_ID:

-			return getProperty_3005ContainedLinks(view);

-		case PropertyForInterfaceEditPart.VISUAL_ID:

-			return getProperty_3006ContainedLinks(view);

-		case PropertyforPrimitiveTypeEditPart.VISUAL_ID:

-			return getProperty_3041ContainedLinks(view);

-		case PropertyforDataTypeEditPart.VISUAL_ID:

-			return getProperty_3018ContainedLinks(view);

-		case NestedClassForClassEditPart.VISUAL_ID:

-			return getClass_3014ContainedLinks(view);

-		case NestedClassForComponentEditPart.VISUAL_ID:

-			return getClass_3004ContainedLinks(view);

-		case NestedClassForInterfaceEditPart.VISUAL_ID:

-			return getClass_3008ContainedLinks(view);

-		case OperationForClassEditPart.VISUAL_ID:

-			return getOperation_3013ContainedLinks(view);

-		case OperationForComponentEditPart.VISUAL_ID:

-			return getOperation_3003ContainedLinks(view);

-		case OperationForInterfaceEditpart.VISUAL_ID:

-			return getOperation_3007ContainedLinks(view);

-		case OperationForPrimitiveTypeEditPart.VISUAL_ID:

-			return getOperation_3042ContainedLinks(view);

-		case OperationForDataTypeEditPart.VISUAL_ID:

-			return getOperation_3019ContainedLinks(view);

-		case ConnectableElementTemplateParameterEditPart.VISUAL_ID:

-			return getConnectableElementTemplateParameter_3034ContainedLinks(view);

-		case OperationTemplateParameterEditPart.VISUAL_ID:

-			return getOperationTemplateParameter_3035ContainedLinks(view);

-		case ClassifierTemplateParameterEditPart.VISUAL_ID:

-			return getClassifierTemplateParameter_3031ContainedLinks(view);

-		case TemplateParameterEditPart.VISUAL_ID:

-			return getTemplateParameter_3016ContainedLinks(view);

-		case EnumerationLiteralEditPart.VISUAL_ID:

-			return getEnumerationLiteral_3017ContainedLinks(view);

-		case ReceptionEditPart.VISUAL_ID:

-			return getReception_3011ContainedLinks(view);

-		case ReceptionInInterfaceEditPart.VISUAL_ID:

-			return getReception_3039ContainedLinks(view);

-		case SlotEditPart.VISUAL_ID:

-			return getSlot_3030ContainedLinks(view);

-		case RedefinableTemplateSignatureEditPart.VISUAL_ID:

-			return getRedefinableTemplateSignature_3015ContainedLinks(view);

-		case TemplateSignatureEditPart.VISUAL_ID:

-			return getTemplateSignature_3033ContainedLinks(view);

-		case InstanceSpecificationEditPartCN.VISUAL_ID:

-			return getInstanceSpecification_3020ContainedLinks(view);

-		case ComponentEditPartCN.VISUAL_ID:

-			return getComponent_3021ContainedLinks(view);

-		case SignalEditPartCN.VISUAL_ID:

-			return getSignal_3022ContainedLinks(view);

-		case InterfaceEditPartCN.VISUAL_ID:

-			return getInterface_3023ContainedLinks(view);

-		case ModelEditPartCN.VISUAL_ID:

-			return getModel_3024ContainedLinks(view);

-		case EnumerationEditPartCN.VISUAL_ID:

-			return getEnumeration_3025ContainedLinks(view);

-		case PackageEditPartCN.VISUAL_ID:

-			return getPackage_3009ContainedLinks(view);

-		case InformationItemEditPartCN.VISUAL_ID:

-			return getInformationItem_3040ContainedLinks(view);

-		case ClassEditPartCN.VISUAL_ID:

-			return getClass_3010ContainedLinks(view);

-		case PrimitiveTypeEditPartCN.VISUAL_ID:

-			return getPrimitiveType_3026ContainedLinks(view);

-		case DataTypeEditPartCN.VISUAL_ID:

-			return getDataType_3027ContainedLinks(view);

-		case CommentEditPartCN.VISUAL_ID:

-			return getComment_3028ContainedLinks(view);

-		case ConstraintEditPartCN.VISUAL_ID:

-			return getConstraint_3029ContainedLinks(view);

-		case NestedInterfaceForClassEditPart.VISUAL_ID:

-			return getInterface_3036ContainedLinks(view);

-		case NestedInterfaceForComponentEditPart.VISUAL_ID:

-			return getInterface_3037ContainedLinks(view);

-		case NestedInterfaceForInterfaceEditPart.VISUAL_ID:

-			return getInterface_3038ContainedLinks(view);

-		case NestedEnumerationForClassEditPart.VISUAL_ID:

-			return getEnumeration_3052ContainedLinks(view);

-		case NestedEnumerationForComponentEditPart.VISUAL_ID:

-			return getEnumeration_3053ContainedLinks(view);

-		case NestedEnumerationForInterfaceEditPart.VISUAL_ID:

-			return getEnumeration_3054ContainedLinks(view);

-		case NestedPrimitiveTypeForClassEditPart.VISUAL_ID:

-			return getPrimitiveType_3047ContainedLinks(view);

-		case NestedPrimitiveTypeForComponentEditPart.VISUAL_ID:

-			return getPrimitiveType_3046ContainedLinks(view);

-		case NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID:

-			return getPrimitiveType_3048ContainedLinks(view);

-		case NestedDataTypeForClassEditPart.VISUAL_ID:

-			return getDataType_3044ContainedLinks(view);

-		case NestedDataTypeForComponentEditPart.VISUAL_ID:

-			return getDataType_3045ContainedLinks(view);

-		case NestedDataTypeForInterfaceEditPart.VISUAL_ID:

-			return getDataType_3043ContainedLinks(view);

-		case NestedSignalForClassEditPart.VISUAL_ID:

-			return getSignal_3050ContainedLinks(view);

-		case NestedSignalForComponentEditPart.VISUAL_ID:

-			return getSignal_3051ContainedLinks(view);

-		case NestedSignalForInterfaceEditPart.VISUAL_ID:

-			return getSignal_3049ContainedLinks(view);

-		case AssociationClassLinkEditPart.VISUAL_ID:

-			return getAssociationClass_4017ContainedLinks(view);

-		case AssociationEditPart.VISUAL_ID:

-			return getAssociation_4001ContainedLinks(view);

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getAssociation_4019ContainedLinks(view);

-		case GeneralizationEditPart.VISUAL_ID:

-			return getGeneralization_4002ContainedLinks(view);

-		case InterfaceRealizationEditPart.VISUAL_ID:

-			return getInterfaceRealization_4003ContainedLinks(view);

-		case SubstitutionEditPart.VISUAL_ID:

-			return getSubstitution_4004ContainedLinks(view);

-		case RealizationEditPart.VISUAL_ID:

-			return getRealization_4005ContainedLinks(view);

-		case AbstractionEditPart.VISUAL_ID:

-			return getAbstraction_4006ContainedLinks(view);

-		case UsageEditPart.VISUAL_ID:

-			return getUsage_4007ContainedLinks(view);

-		case DependencyEditPart.VISUAL_ID:

-			return getDependency_4008ContainedLinks(view);

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getDependency_4018ContainedLinks(view);

-		case ElementImportEditPart.VISUAL_ID:

-			return getElementImport_4009ContainedLinks(view);

-		case PackageImportEditPart.VISUAL_ID:

-			return getPackageImport_4010ContainedLinks(view);

-		case PackageMergeEditPart.VISUAL_ID:

-			return getPackageMerge_4011ContainedLinks(view);

-		case ProfileApplicationEditPart.VISUAL_ID:

-			return getProfileApplication_4012ContainedLinks(view);

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getTemplateBinding_4015ContainedLinks(view);

-		case GeneralizationSetEditPart.VISUAL_ID:

-			return getGeneralizationSet_4020ContainedLinks(view);

-		case InstanceSpecificationLinkEditPart.VISUAL_ID:

-			return getInstanceSpecification_4021ContainedLinks(view);

-		case InformationFlowEditPart.VISUAL_ID:

-			return getInformationFlow_4026ContainedLinks(view);

-		}

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getIncomingLinks(View view) {

-		switch (UMLVisualIDRegistry.getVisualID(view)) {

-		case DependencyNodeEditPart.VISUAL_ID:

-			return getDependency_2014IncomingLinks(view);

-		case AssociationClassEditPart.VISUAL_ID:

-			return getAssociationClass_2013IncomingLinks(view);

-		case AssociationNodeEditPart.VISUAL_ID:

-			return getAssociation_2015IncomingLinks(view);

-		case InstanceSpecificationEditPart.VISUAL_ID:

-			return getInstanceSpecification_2001IncomingLinks(view);

-		case ComponentEditPart.VISUAL_ID:

-			return getComponent_2002IncomingLinks(view);

-		case SignalEditPart.VISUAL_ID:

-			return getSignal_2003IncomingLinks(view);

-		case InterfaceEditPart.VISUAL_ID:

-			return getInterface_2004IncomingLinks(view);

-		case ModelEditPartTN.VISUAL_ID:

-			return getModel_2005IncomingLinks(view);

-		case EnumerationEditPart.VISUAL_ID:

-			return getEnumeration_2006IncomingLinks(view);

-		case PackageEditPart.VISUAL_ID:

-			return getPackage_2007IncomingLinks(view);

-		case InformationItemEditPart.VISUAL_ID:

-			return getInformationItem_2099IncomingLinks(view);

-		case ClassEditPart.VISUAL_ID:

-			return getClass_2008IncomingLinks(view);

-		case PrimitiveTypeEditPart.VISUAL_ID:

-			return getPrimitiveType_2009IncomingLinks(view);

-		case DataTypeEditPart.VISUAL_ID:

-			return getDataType_2010IncomingLinks(view);

-		case ConstraintEditPart.VISUAL_ID:

-			return getConstraint_2011IncomingLinks(view);

-		case CommentEditPart.VISUAL_ID:

-			return getComment_2012IncomingLinks(view);

-		case ShortCutDiagramEditPart.VISUAL_ID:

-			return getDiagram_2016IncomingLinks(view);

-		case DurationObservationEditPart.VISUAL_ID:

-			return getDurationObservation_2095IncomingLinks(view);

-		case TimeObservationEditPart.VISUAL_ID:

-			return getTimeObservation_2096IncomingLinks(view);

-		case DefaultNamedElementEditPart.VISUAL_ID:

-			return getNamedElement_2097IncomingLinks(view);

-		case PropertyForClassEditPart.VISUAL_ID:

-			return getProperty_3012IncomingLinks(view);

-		case PropertyForComponentEditPart.VISUAL_ID:

-			return getProperty_3002IncomingLinks(view);

-		case PropertyForSignalEditPart.VISUAL_ID:

-			return getProperty_3005IncomingLinks(view);

-		case PropertyForInterfaceEditPart.VISUAL_ID:

-			return getProperty_3006IncomingLinks(view);

-		case PropertyforPrimitiveTypeEditPart.VISUAL_ID:

-			return getProperty_3041IncomingLinks(view);

-		case PropertyforDataTypeEditPart.VISUAL_ID:

-			return getProperty_3018IncomingLinks(view);

-		case NestedClassForClassEditPart.VISUAL_ID:

-			return getClass_3014IncomingLinks(view);

-		case NestedClassForComponentEditPart.VISUAL_ID:

-			return getClass_3004IncomingLinks(view);

-		case NestedClassForInterfaceEditPart.VISUAL_ID:

-			return getClass_3008IncomingLinks(view);

-		case OperationForClassEditPart.VISUAL_ID:

-			return getOperation_3013IncomingLinks(view);

-		case OperationForComponentEditPart.VISUAL_ID:

-			return getOperation_3003IncomingLinks(view);

-		case OperationForInterfaceEditpart.VISUAL_ID:

-			return getOperation_3007IncomingLinks(view);

-		case OperationForPrimitiveTypeEditPart.VISUAL_ID:

-			return getOperation_3042IncomingLinks(view);

-		case OperationForDataTypeEditPart.VISUAL_ID:

-			return getOperation_3019IncomingLinks(view);

-		case ConnectableElementTemplateParameterEditPart.VISUAL_ID:

-			return getConnectableElementTemplateParameter_3034IncomingLinks(view);

-		case OperationTemplateParameterEditPart.VISUAL_ID:

-			return getOperationTemplateParameter_3035IncomingLinks(view);

-		case ClassifierTemplateParameterEditPart.VISUAL_ID:

-			return getClassifierTemplateParameter_3031IncomingLinks(view);

-		case TemplateParameterEditPart.VISUAL_ID:

-			return getTemplateParameter_3016IncomingLinks(view);

-		case EnumerationLiteralEditPart.VISUAL_ID:

-			return getEnumerationLiteral_3017IncomingLinks(view);

-		case ReceptionEditPart.VISUAL_ID:

-			return getReception_3011IncomingLinks(view);

-		case ReceptionInInterfaceEditPart.VISUAL_ID:

-			return getReception_3039IncomingLinks(view);

-		case SlotEditPart.VISUAL_ID:

-			return getSlot_3030IncomingLinks(view);

-		case RedefinableTemplateSignatureEditPart.VISUAL_ID:

-			return getRedefinableTemplateSignature_3015IncomingLinks(view);

-		case TemplateSignatureEditPart.VISUAL_ID:

-			return getTemplateSignature_3033IncomingLinks(view);

-		case InstanceSpecificationEditPartCN.VISUAL_ID:

-			return getInstanceSpecification_3020IncomingLinks(view);

-		case ComponentEditPartCN.VISUAL_ID:

-			return getComponent_3021IncomingLinks(view);

-		case SignalEditPartCN.VISUAL_ID:

-			return getSignal_3022IncomingLinks(view);

-		case InterfaceEditPartCN.VISUAL_ID:

-			return getInterface_3023IncomingLinks(view);

-		case ModelEditPartCN.VISUAL_ID:

-			return getModel_3024IncomingLinks(view);

-		case EnumerationEditPartCN.VISUAL_ID:

-			return getEnumeration_3025IncomingLinks(view);

-		case PackageEditPartCN.VISUAL_ID:

-			return getPackage_3009IncomingLinks(view);

-		case InformationItemEditPartCN.VISUAL_ID:

-			return getInformationItem_3040IncomingLinks(view);

-		case ClassEditPartCN.VISUAL_ID:

-			return getClass_3010IncomingLinks(view);

-		case PrimitiveTypeEditPartCN.VISUAL_ID:

-			return getPrimitiveType_3026IncomingLinks(view);

-		case DataTypeEditPartCN.VISUAL_ID:

-			return getDataType_3027IncomingLinks(view);

-		case CommentEditPartCN.VISUAL_ID:

-			return getComment_3028IncomingLinks(view);

-		case ConstraintEditPartCN.VISUAL_ID:

-			return getConstraint_3029IncomingLinks(view);

-		case NestedInterfaceForClassEditPart.VISUAL_ID:

-			return getInterface_3036IncomingLinks(view);

-		case NestedInterfaceForComponentEditPart.VISUAL_ID:

-			return getInterface_3037IncomingLinks(view);

-		case NestedInterfaceForInterfaceEditPart.VISUAL_ID:

-			return getInterface_3038IncomingLinks(view);

-		case NestedEnumerationForClassEditPart.VISUAL_ID:

-			return getEnumeration_3052IncomingLinks(view);

-		case NestedEnumerationForComponentEditPart.VISUAL_ID:

-			return getEnumeration_3053IncomingLinks(view);

-		case NestedEnumerationForInterfaceEditPart.VISUAL_ID:

-			return getEnumeration_3054IncomingLinks(view);

-		case NestedPrimitiveTypeForClassEditPart.VISUAL_ID:

-			return getPrimitiveType_3047IncomingLinks(view);

-		case NestedPrimitiveTypeForComponentEditPart.VISUAL_ID:

-			return getPrimitiveType_3046IncomingLinks(view);

-		case NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID:

-			return getPrimitiveType_3048IncomingLinks(view);

-		case NestedDataTypeForClassEditPart.VISUAL_ID:

-			return getDataType_3044IncomingLinks(view);

-		case NestedDataTypeForComponentEditPart.VISUAL_ID:

-			return getDataType_3045IncomingLinks(view);

-		case NestedDataTypeForInterfaceEditPart.VISUAL_ID:

-			return getDataType_3043IncomingLinks(view);

-		case NestedSignalForClassEditPart.VISUAL_ID:

-			return getSignal_3050IncomingLinks(view);

-		case NestedSignalForComponentEditPart.VISUAL_ID:

-			return getSignal_3051IncomingLinks(view);

-		case NestedSignalForInterfaceEditPart.VISUAL_ID:

-			return getSignal_3049IncomingLinks(view);

-		case AssociationClassLinkEditPart.VISUAL_ID:

-			return getAssociationClass_4017IncomingLinks(view);

-		case AssociationEditPart.VISUAL_ID:

-			return getAssociation_4001IncomingLinks(view);

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getAssociation_4019IncomingLinks(view);

-		case GeneralizationEditPart.VISUAL_ID:

-			return getGeneralization_4002IncomingLinks(view);

-		case InterfaceRealizationEditPart.VISUAL_ID:

-			return getInterfaceRealization_4003IncomingLinks(view);

-		case SubstitutionEditPart.VISUAL_ID:

-			return getSubstitution_4004IncomingLinks(view);

-		case RealizationEditPart.VISUAL_ID:

-			return getRealization_4005IncomingLinks(view);

-		case AbstractionEditPart.VISUAL_ID:

-			return getAbstraction_4006IncomingLinks(view);

-		case UsageEditPart.VISUAL_ID:

-			return getUsage_4007IncomingLinks(view);

-		case DependencyEditPart.VISUAL_ID:

-			return getDependency_4008IncomingLinks(view);

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getDependency_4018IncomingLinks(view);

-		case ElementImportEditPart.VISUAL_ID:

-			return getElementImport_4009IncomingLinks(view);

-		case PackageImportEditPart.VISUAL_ID:

-			return getPackageImport_4010IncomingLinks(view);

-		case PackageMergeEditPart.VISUAL_ID:

-			return getPackageMerge_4011IncomingLinks(view);

-		case ProfileApplicationEditPart.VISUAL_ID:

-			return getProfileApplication_4012IncomingLinks(view);

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getTemplateBinding_4015IncomingLinks(view);

-		case GeneralizationSetEditPart.VISUAL_ID:

-			return getGeneralizationSet_4020IncomingLinks(view);

-		case InstanceSpecificationLinkEditPart.VISUAL_ID:

-			return getInstanceSpecification_4021IncomingLinks(view);

-		case InformationFlowEditPart.VISUAL_ID:

-			return getInformationFlow_4026IncomingLinks(view);

-		}

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOutgoingLinks(View view) {

-		switch (UMLVisualIDRegistry.getVisualID(view)) {

-		case DependencyNodeEditPart.VISUAL_ID:

-			return getDependency_2014OutgoingLinks(view);

-		case AssociationClassEditPart.VISUAL_ID:

-			return getAssociationClass_2013OutgoingLinks(view);

-		case AssociationNodeEditPart.VISUAL_ID:

-			return getAssociation_2015OutgoingLinks(view);

-		case InstanceSpecificationEditPart.VISUAL_ID:

-			return getInstanceSpecification_2001OutgoingLinks(view);

-		case ComponentEditPart.VISUAL_ID:

-			return getComponent_2002OutgoingLinks(view);

-		case SignalEditPart.VISUAL_ID:

-			return getSignal_2003OutgoingLinks(view);

-		case InterfaceEditPart.VISUAL_ID:

-			return getInterface_2004OutgoingLinks(view);

-		case ModelEditPartTN.VISUAL_ID:

-			return getModel_2005OutgoingLinks(view);

-		case EnumerationEditPart.VISUAL_ID:

-			return getEnumeration_2006OutgoingLinks(view);

-		case PackageEditPart.VISUAL_ID:

-			return getPackage_2007OutgoingLinks(view);

-		case InformationItemEditPart.VISUAL_ID:

-			return getInformationItem_2099OutgoingLinks(view);

-		case ClassEditPart.VISUAL_ID:

-			return getClass_2008OutgoingLinks(view);

-		case PrimitiveTypeEditPart.VISUAL_ID:

-			return getPrimitiveType_2009OutgoingLinks(view);

-		case DataTypeEditPart.VISUAL_ID:

-			return getDataType_2010OutgoingLinks(view);

-		case ConstraintEditPart.VISUAL_ID:

-			return getConstraint_2011OutgoingLinks(view);

-		case CommentEditPart.VISUAL_ID:

-			return getComment_2012OutgoingLinks(view);

-		case ShortCutDiagramEditPart.VISUAL_ID:

-			return getDiagram_2016OutgoingLinks(view);

-		case DurationObservationEditPart.VISUAL_ID:

-			return getDurationObservation_2095OutgoingLinks(view);

-		case TimeObservationEditPart.VISUAL_ID:

-			return getTimeObservation_2096OutgoingLinks(view);

-		case DefaultNamedElementEditPart.VISUAL_ID:

-			return getNamedElement_2097OutgoingLinks(view);

-		case PropertyForClassEditPart.VISUAL_ID:

-			return getProperty_3012OutgoingLinks(view);

-		case PropertyForComponentEditPart.VISUAL_ID:

-			return getProperty_3002OutgoingLinks(view);

-		case PropertyForSignalEditPart.VISUAL_ID:

-			return getProperty_3005OutgoingLinks(view);

-		case PropertyForInterfaceEditPart.VISUAL_ID:

-			return getProperty_3006OutgoingLinks(view);

-		case PropertyforPrimitiveTypeEditPart.VISUAL_ID:

-			return getProperty_3041OutgoingLinks(view);

-		case PropertyforDataTypeEditPart.VISUAL_ID:

-			return getProperty_3018OutgoingLinks(view);

-		case NestedClassForClassEditPart.VISUAL_ID:

-			return getClass_3014OutgoingLinks(view);

-		case NestedClassForComponentEditPart.VISUAL_ID:

-			return getClass_3004OutgoingLinks(view);

-		case NestedClassForInterfaceEditPart.VISUAL_ID:

-			return getClass_3008OutgoingLinks(view);

-		case OperationForClassEditPart.VISUAL_ID:

-			return getOperation_3013OutgoingLinks(view);

-		case OperationForComponentEditPart.VISUAL_ID:

-			return getOperation_3003OutgoingLinks(view);

-		case OperationForInterfaceEditpart.VISUAL_ID:

-			return getOperation_3007OutgoingLinks(view);

-		case OperationForPrimitiveTypeEditPart.VISUAL_ID:

-			return getOperation_3042OutgoingLinks(view);

-		case OperationForDataTypeEditPart.VISUAL_ID:

-			return getOperation_3019OutgoingLinks(view);

-		case ConnectableElementTemplateParameterEditPart.VISUAL_ID:

-			return getConnectableElementTemplateParameter_3034OutgoingLinks(view);

-		case OperationTemplateParameterEditPart.VISUAL_ID:

-			return getOperationTemplateParameter_3035OutgoingLinks(view);

-		case ClassifierTemplateParameterEditPart.VISUAL_ID:

-			return getClassifierTemplateParameter_3031OutgoingLinks(view);

-		case TemplateParameterEditPart.VISUAL_ID:

-			return getTemplateParameter_3016OutgoingLinks(view);

-		case EnumerationLiteralEditPart.VISUAL_ID:

-			return getEnumerationLiteral_3017OutgoingLinks(view);

-		case ReceptionEditPart.VISUAL_ID:

-			return getReception_3011OutgoingLinks(view);

-		case ReceptionInInterfaceEditPart.VISUAL_ID:

-			return getReception_3039OutgoingLinks(view);

-		case SlotEditPart.VISUAL_ID:

-			return getSlot_3030OutgoingLinks(view);

-		case RedefinableTemplateSignatureEditPart.VISUAL_ID:

-			return getRedefinableTemplateSignature_3015OutgoingLinks(view);

-		case TemplateSignatureEditPart.VISUAL_ID:

-			return getTemplateSignature_3033OutgoingLinks(view);

-		case InstanceSpecificationEditPartCN.VISUAL_ID:

-			return getInstanceSpecification_3020OutgoingLinks(view);

-		case ComponentEditPartCN.VISUAL_ID:

-			return getComponent_3021OutgoingLinks(view);

-		case SignalEditPartCN.VISUAL_ID:

-			return getSignal_3022OutgoingLinks(view);

-		case InterfaceEditPartCN.VISUAL_ID:

-			return getInterface_3023OutgoingLinks(view);

-		case ModelEditPartCN.VISUAL_ID:

-			return getModel_3024OutgoingLinks(view);

-		case EnumerationEditPartCN.VISUAL_ID:

-			return getEnumeration_3025OutgoingLinks(view);

-		case PackageEditPartCN.VISUAL_ID:

-			return getPackage_3009OutgoingLinks(view);

-		case InformationItemEditPartCN.VISUAL_ID:

-			return getInformationItem_3040OutgoingLinks(view);

-		case ClassEditPartCN.VISUAL_ID:

-			return getClass_3010OutgoingLinks(view);

-		case PrimitiveTypeEditPartCN.VISUAL_ID:

-			return getPrimitiveType_3026OutgoingLinks(view);

-		case DataTypeEditPartCN.VISUAL_ID:

-			return getDataType_3027OutgoingLinks(view);

-		case CommentEditPartCN.VISUAL_ID:

-			return getComment_3028OutgoingLinks(view);

-		case ConstraintEditPartCN.VISUAL_ID:

-			return getConstraint_3029OutgoingLinks(view);

-		case NestedInterfaceForClassEditPart.VISUAL_ID:

-			return getInterface_3036OutgoingLinks(view);

-		case NestedInterfaceForComponentEditPart.VISUAL_ID:

-			return getInterface_3037OutgoingLinks(view);

-		case NestedInterfaceForInterfaceEditPart.VISUAL_ID:

-			return getInterface_3038OutgoingLinks(view);

-		case NestedEnumerationForClassEditPart.VISUAL_ID:

-			return getEnumeration_3052OutgoingLinks(view);

-		case NestedEnumerationForComponentEditPart.VISUAL_ID:

-			return getEnumeration_3053OutgoingLinks(view);

-		case NestedEnumerationForInterfaceEditPart.VISUAL_ID:

-			return getEnumeration_3054OutgoingLinks(view);

-		case NestedPrimitiveTypeForClassEditPart.VISUAL_ID:

-			return getPrimitiveType_3047OutgoingLinks(view);

-		case NestedPrimitiveTypeForComponentEditPart.VISUAL_ID:

-			return getPrimitiveType_3046OutgoingLinks(view);

-		case NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID:

-			return getPrimitiveType_3048OutgoingLinks(view);

-		case NestedDataTypeForClassEditPart.VISUAL_ID:

-			return getDataType_3044OutgoingLinks(view);

-		case NestedDataTypeForComponentEditPart.VISUAL_ID:

-			return getDataType_3045OutgoingLinks(view);

-		case NestedDataTypeForInterfaceEditPart.VISUAL_ID:

-			return getDataType_3043OutgoingLinks(view);

-		case NestedSignalForClassEditPart.VISUAL_ID:

-			return getSignal_3050OutgoingLinks(view);

-		case NestedSignalForComponentEditPart.VISUAL_ID:

-			return getSignal_3051OutgoingLinks(view);

-		case NestedSignalForInterfaceEditPart.VISUAL_ID:

-			return getSignal_3049OutgoingLinks(view);

-		case AssociationClassLinkEditPart.VISUAL_ID:

-			return getAssociationClass_4017OutgoingLinks(view);

-		case AssociationEditPart.VISUAL_ID:

-			return getAssociation_4001OutgoingLinks(view);

-		case AssociationBranchEditPart.VISUAL_ID:

-			return getAssociation_4019OutgoingLinks(view);

-		case GeneralizationEditPart.VISUAL_ID:

-			return getGeneralization_4002OutgoingLinks(view);

-		case InterfaceRealizationEditPart.VISUAL_ID:

-			return getInterfaceRealization_4003OutgoingLinks(view);

-		case SubstitutionEditPart.VISUAL_ID:

-			return getSubstitution_4004OutgoingLinks(view);

-		case RealizationEditPart.VISUAL_ID:

-			return getRealization_4005OutgoingLinks(view);

-		case AbstractionEditPart.VISUAL_ID:

-			return getAbstraction_4006OutgoingLinks(view);

-		case UsageEditPart.VISUAL_ID:

-			return getUsage_4007OutgoingLinks(view);

-		case DependencyEditPart.VISUAL_ID:

-			return getDependency_4008OutgoingLinks(view);

-		case DependencyBranchEditPart.VISUAL_ID:

-			return getDependency_4018OutgoingLinks(view);

-		case ElementImportEditPart.VISUAL_ID:

-			return getElementImport_4009OutgoingLinks(view);

-		case PackageImportEditPart.VISUAL_ID:

-			return getPackageImport_4010OutgoingLinks(view);

-		case PackageMergeEditPart.VISUAL_ID:

-			return getPackageMerge_4011OutgoingLinks(view);

-		case ProfileApplicationEditPart.VISUAL_ID:

-			return getProfileApplication_4012OutgoingLinks(view);

-		case TemplateBindingEditPart.VISUAL_ID:

-			return getTemplateBinding_4015OutgoingLinks(view);

-		case GeneralizationSetEditPart.VISUAL_ID:

-			return getGeneralizationSet_4020OutgoingLinks(view);

-		case InstanceSpecificationLinkEditPart.VISUAL_ID:

-			return getInstanceSpecification_4021OutgoingLinks(view);

-		case InformationFlowEditPart.VISUAL_ID:

-			return getInformationFlow_4026OutgoingLinks(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_AssociationClass_4017

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageMerge_4011

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_4012

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_GeneralizationSet_4020

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InstanceSpecification_4021

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDependency_2014ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAssociationClass_2013ContainedLinks(View view) {

-		AssociationClass modelElement = (AssociationClass) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAssociation_2015ContainedLinks(View view) {

-		Association modelElement = (Association) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInstanceSpecification_2001ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getComponent_2002ContainedLinks(View view) {

-		Component modelElement = (Component) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSignal_2003ContainedLinks(View view) {

-		Signal modelElement = (Signal) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterface_2004ContainedLinks(View view) {

-		Interface modelElement = (Interface) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getModel_2005ContainedLinks(View view) {

-		Model modelElement = (Model) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageMerge_4011

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_4012

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_GeneralizationSet_4020

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InstanceSpecification_4021

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumeration_2006ContainedLinks(View view) {

-		Enumeration modelElement = (Enumeration) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPackage_2007ContainedLinks(View view) {

-		Package modelElement = (Package) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageMerge_4011

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_4012

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_GeneralizationSet_4020

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InstanceSpecification_4021

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInformationItem_2099ContainedLinks(View view) {

-		InformationItem modelElement = (InformationItem) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClass_2008ContainedLinks(View view) {

-		Class modelElement = (Class) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPrimitiveType_2009ContainedLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDataType_2010ContainedLinks(View view) {

-		DataType modelElement = (DataType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getConstraint_2011ContainedLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getComment_2012ContainedLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDiagram_2016ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDurationObservation_2095ContainedLinks(View view) {

-		DurationObservation modelElement = (DurationObservation) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getTimeObservation_2096ContainedLinks(View view) {

-		TimeObservation modelElement = (TimeObservation) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getNamedElement_2097ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3012ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3002ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3005ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3006ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3041ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3018ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClass_3014ContainedLinks(View view) {

-		Class modelElement = (Class) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClass_3004ContainedLinks(View view) {

-		Class modelElement = (Class) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClass_3008ContainedLinks(View view) {

-		Class modelElement = (Class) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperation_3013ContainedLinks(View view) {

-		Operation modelElement = (Operation) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperation_3003ContainedLinks(View view) {

-		Operation modelElement = (Operation) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperation_3007ContainedLinks(View view) {

-		Operation modelElement = (Operation) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperation_3042ContainedLinks(View view) {

-		Operation modelElement = (Operation) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperation_3019ContainedLinks(View view) {

-		Operation modelElement = (Operation) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getConnectableElementTemplateParameter_3034ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperationTemplateParameter_3035ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClassifierTemplateParameter_3031ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getTemplateParameter_3016ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumerationLiteral_3017ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getReception_3011ContainedLinks(View view) {

-		Reception modelElement = (Reception) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getReception_3039ContainedLinks(View view) {

-		Reception modelElement = (Reception) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSlot_3030ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getRedefinableTemplateSignature_3015ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getTemplateSignature_3033ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInstanceSpecification_3020ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getComponent_3021ContainedLinks(View view) {

-		Component modelElement = (Component) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSignal_3022ContainedLinks(View view) {

-		Signal modelElement = (Signal) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterface_3023ContainedLinks(View view) {

-		Interface modelElement = (Interface) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getModel_3024ContainedLinks(View view) {

-		Model modelElement = (Model) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageMerge_4011

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_4012

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_GeneralizationSet_4020

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InstanceSpecification_4021

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumeration_3025ContainedLinks(View view) {

-		Enumeration modelElement = (Enumeration) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPackage_3009ContainedLinks(View view) {

-		Package modelElement = (Package) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageMerge_4011

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_4012

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_GeneralizationSet_4020

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InstanceSpecification_4021

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInformationItem_3040ContainedLinks(View view) {

-		InformationItem modelElement = (InformationItem) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClass_3010ContainedLinks(View view) {

-		Class modelElement = (Class) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPrimitiveType_3026ContainedLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDataType_3027ContainedLinks(View view) {

-		DataType modelElement = (DataType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getComment_3028ContainedLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getConstraint_3029ContainedLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterface_3036ContainedLinks(View view) {

-		Interface modelElement = (Interface) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterface_3037ContainedLinks(View view) {

-		Interface modelElement = (Interface) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterface_3038ContainedLinks(View view) {

-		Interface modelElement = (Interface) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumeration_3052ContainedLinks(View view) {

-		Enumeration modelElement = (Enumeration) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumeration_3053ContainedLinks(View view) {

-		Enumeration modelElement = (Enumeration) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumeration_3054ContainedLinks(View view) {

-		Enumeration modelElement = (Enumeration) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPrimitiveType_3047ContainedLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPrimitiveType_3046ContainedLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPrimitiveType_3048ContainedLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDataType_3044ContainedLinks(View view) {

-		DataType modelElement = (DataType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDataType_3045ContainedLinks(View view) {

-		DataType modelElement = (DataType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDataType_3043ContainedLinks(View view) {

-		DataType modelElement = (DataType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSignal_3050ContainedLinks(View view) {

-		Signal modelElement = (Signal) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSignal_3051ContainedLinks(View view) {

-		Signal modelElement = (Signal) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSignal_3049ContainedLinks(View view) {

-		Signal modelElement = (Signal) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAssociationClass_4017ContainedLinks(View view) {

-		AssociationClass modelElement = (AssociationClass) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAssociation_4001ContainedLinks(View view) {

-		Association modelElement = (Association) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAssociation_4019ContainedLinks(View view) {

-		Association modelElement = (Association) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getGeneralization_4002ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterfaceRealization_4003ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSubstitution_4004ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getRealization_4005ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAbstraction_4006ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getUsage_4007ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDependency_4008ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDependency_4018ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getElementImport_4009ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPackageImport_4010ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPackageMerge_4011ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProfileApplication_4012ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getTemplateBinding_4015ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getGeneralizationSet_4020ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInstanceSpecification_4021ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInformationFlow_4026ContainedLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDependency_2014IncomingLinks(View view) {

-		Dependency modelElement = (Dependency) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAssociationClass_2013IncomingLinks(View view) {

-		AssociationClass modelElement = (AssociationClass) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAssociation_2015IncomingLinks(View view) {

-		Association modelElement = (Association) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInstanceSpecification_2001IncomingLinks(View view) {

-		InstanceSpecification modelElement = (InstanceSpecification) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getComponent_2002IncomingLinks(View view) {

-		Component modelElement = (Component) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSignal_2003IncomingLinks(View view) {

-		Signal modelElement = (Signal) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterface_2004IncomingLinks(View view) {

-		Interface modelElement = (Interface) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getModel_2005IncomingLinks(View view) {

-		Model modelElement = (Model) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_PackageImport_4010

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_PackageMerge_4011

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumeration_2006IncomingLinks(View view) {

-		Enumeration modelElement = (Enumeration) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPackage_2007IncomingLinks(View view) {

-		Package modelElement = (Package) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_PackageImport_4010

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_PackageMerge_4011

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInformationItem_2099IncomingLinks(View view) {

-		InformationItem modelElement = (InformationItem) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClass_2008IncomingLinks(View view) {

-		Class modelElement = (Class) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPrimitiveType_2009IncomingLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDataType_2010IncomingLinks(View view) {

-		DataType modelElement = (DataType) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getConstraint_2011IncomingLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getComment_2012IncomingLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDiagram_2016IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDurationObservation_2095IncomingLinks(View view) {

-		DurationObservation modelElement = (DurationObservation) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getTimeObservation_2096IncomingLinks(View view) {

-		TimeObservation modelElement = (TimeObservation) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getNamedElement_2097IncomingLinks(View view) {

-		NamedElement modelElement = (NamedElement) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3012IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3002IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3005IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3006IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3041IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3018IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClass_3014IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClass_3004IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClass_3008IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperation_3013IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperation_3003IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperation_3007IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperation_3042IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperation_3019IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getConnectableElementTemplateParameter_3034IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperationTemplateParameter_3035IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClassifierTemplateParameter_3031IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getTemplateParameter_3016IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumerationLiteral_3017IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getReception_3011IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getReception_3039IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSlot_3030IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getRedefinableTemplateSignature_3015IncomingLinks(View view) {

-		RedefinableTemplateSignature modelElement = (RedefinableTemplateSignature) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getTemplateSignature_3033IncomingLinks(View view) {

-		TemplateSignature modelElement = (TemplateSignature) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInstanceSpecification_3020IncomingLinks(View view) {

-		InstanceSpecification modelElement = (InstanceSpecification) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getComponent_3021IncomingLinks(View view) {

-		Component modelElement = (Component) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSignal_3022IncomingLinks(View view) {

-		Signal modelElement = (Signal) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterface_3023IncomingLinks(View view) {

-		Interface modelElement = (Interface) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getModel_3024IncomingLinks(View view) {

-		Model modelElement = (Model) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_PackageImport_4010

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_PackageMerge_4011

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumeration_3025IncomingLinks(View view) {

-		Enumeration modelElement = (Enumeration) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPackage_3009IncomingLinks(View view) {

-		Package modelElement = (Package) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_PackageImport_4010

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_PackageMerge_4011

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInformationItem_3040IncomingLinks(View view) {

-		InformationItem modelElement = (InformationItem) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClass_3010IncomingLinks(View view) {

-		Class modelElement = (Class) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPrimitiveType_3026IncomingLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDataType_3027IncomingLinks(View view) {

-		DataType modelElement = (DataType) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getComment_3028IncomingLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getConstraint_3029IncomingLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterface_3036IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterface_3037IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterface_3038IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumeration_3052IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumeration_3053IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumeration_3054IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPrimitiveType_3047IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPrimitiveType_3046IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPrimitiveType_3048IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDataType_3044IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDataType_3045IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDataType_3043IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSignal_3050IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSignal_3051IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSignal_3049IncomingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAssociationClass_4017IncomingLinks(View view) {

-		AssociationClass modelElement = (AssociationClass) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAssociation_4001IncomingLinks(View view) {

-		Association modelElement = (Association) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAssociation_4019IncomingLinks(View view) {

-		Association modelElement = (Association) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4001

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Association_4019

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4004

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getGeneralization_4002IncomingLinks(View view) {

-		Generalization modelElement = (Generalization) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_GeneralizationSet_4020

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterfaceRealization_4003IncomingLinks(View view) {

-		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSubstitution_4004IncomingLinks(View view) {

-		Substitution modelElement = (Substitution) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getRealization_4005IncomingLinks(View view) {

-		Realization modelElement = (Realization) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAbstraction_4006IncomingLinks(View view) {

-		Abstraction modelElement = (Abstraction) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getUsage_4007IncomingLinks(View view) {

-		Usage modelElement = (Usage) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDependency_4008IncomingLinks(View view) {

-		Dependency modelElement = (Dependency) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDependency_4018IncomingLinks(View view) {

-		Dependency modelElement = (Dependency) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getElementImport_4009IncomingLinks(View view) {

-		ElementImport modelElement = (ElementImport) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPackageImport_4010IncomingLinks(View view) {

-		PackageImport modelElement = (PackageImport) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPackageMerge_4011IncomingLinks(View view) {

-		PackageMerge modelElement = (PackageMerge) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProfileApplication_4012IncomingLinks(View view) {

-		ProfileApplication modelElement = (ProfileApplication) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getTemplateBinding_4015IncomingLinks(View view) {

-		TemplateBinding modelElement = (TemplateBinding) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getGeneralizationSet_4020IncomingLinks(View view) {

-		GeneralizationSet modelElement = (GeneralizationSet) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInstanceSpecification_4021IncomingLinks(View view) {

-		InstanceSpecification modelElement = (InstanceSpecification) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInformationFlow_4026IncomingLinks(View view) {

-		InformationFlow modelElement = (InformationFlow) view.getElement();

-		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4005

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4006

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4007

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_ElementImport_4009

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement, crossReferences));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement, crossReferences));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement, crossReferences));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDependency_2014OutgoingLinks(View view) {

-		Dependency modelElement = (Dependency) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAssociationClass_2013OutgoingLinks(View view) {

-		AssociationClass modelElement = (AssociationClass) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAssociation_2015OutgoingLinks(View view) {

-		Association modelElement = (Association) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInstanceSpecification_2001OutgoingLinks(View view) {

-		InstanceSpecification modelElement = (InstanceSpecification) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getComponent_2002OutgoingLinks(View view) {

-		Component modelElement = (Component) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSignal_2003OutgoingLinks(View view) {

-		Signal modelElement = (Signal) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterface_2004OutgoingLinks(View view) {

-		Interface modelElement = (Interface) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getModel_2005OutgoingLinks(View view) {

-		Model modelElement = (Model) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_PackageMerge_4011

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumeration_2006OutgoingLinks(View view) {

-		Enumeration modelElement = (Enumeration) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPackage_2007OutgoingLinks(View view) {

-		Package modelElement = (Package) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_PackageMerge_4011

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInformationItem_2099OutgoingLinks(View view) {

-		InformationItem modelElement = (InformationItem) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClass_2008OutgoingLinks(View view) {

-		Class modelElement = (Class) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPrimitiveType_2009OutgoingLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDataType_2010OutgoingLinks(View view) {

-		DataType modelElement = (DataType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getConstraint_2011OutgoingLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getComment_2012OutgoingLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDiagram_2016OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDurationObservation_2095OutgoingLinks(View view) {

-		DurationObservation modelElement = (DurationObservation) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4025

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getTimeObservation_2096OutgoingLinks(View view) {

-		TimeObservation modelElement = (TimeObservation) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4024

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getNamedElement_2097OutgoingLinks(View view) {

-		NamedElement modelElement = (NamedElement) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3012OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3002OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3005OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3006OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3041OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProperty_3018OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClass_3014OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClass_3004OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClass_3008OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperation_3013OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperation_3003OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperation_3007OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperation_3042OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperation_3019OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getConnectableElementTemplateParameter_3034OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getOperationTemplateParameter_3035OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClassifierTemplateParameter_3031OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getTemplateParameter_3016OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumerationLiteral_3017OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getReception_3011OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getReception_3039OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSlot_3030OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getRedefinableTemplateSignature_3015OutgoingLinks(View view) {

-		RedefinableTemplateSignature modelElement = (RedefinableTemplateSignature) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getTemplateSignature_3033OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInstanceSpecification_3020OutgoingLinks(View view) {

-		InstanceSpecification modelElement = (InstanceSpecification) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getComponent_3021OutgoingLinks(View view) {

-		Component modelElement = (Component) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSignal_3022OutgoingLinks(View view) {

-		Signal modelElement = (Signal) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterface_3023OutgoingLinks(View view) {

-		Interface modelElement = (Interface) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getModel_3024OutgoingLinks(View view) {

-		Model modelElement = (Model) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_PackageMerge_4011

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumeration_3025OutgoingLinks(View view) {

-		Enumeration modelElement = (Enumeration) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPackage_3009OutgoingLinks(View view) {

-		Package modelElement = (Package) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_PackageMerge_4011

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInformationItem_3040OutgoingLinks(View view) {

-		InformationItem modelElement = (InformationItem) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getClass_3010OutgoingLinks(View view) {

-		Class modelElement = (Class) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPrimitiveType_3026OutgoingLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDataType_3027OutgoingLinks(View view) {

-		DataType modelElement = (DataType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getComment_3028OutgoingLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4013

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getConstraint_3029OutgoingLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_Context_8500

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterface_3036OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterface_3037OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterface_3038OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumeration_3052OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumeration_3053OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getEnumeration_3054OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPrimitiveType_3047OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPrimitiveType_3046OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPrimitiveType_3048OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDataType_3044OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDataType_3045OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDataType_3043OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSignal_3050OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSignal_3051OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSignal_3049OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAssociationClass_4017OutgoingLinks(View view) {

-		AssociationClass modelElement = (AssociationClass) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAssociation_4001OutgoingLinks(View view) {

-		Association modelElement = (Association) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAssociation_4019OutgoingLinks(View view) {

-		Association modelElement = (Association) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4001

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Association_4019

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4002

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_TemplateBinding_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getGeneralization_4002OutgoingLinks(View view) {

-		Generalization modelElement = (Generalization) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_GeneralizationSet_4020

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInterfaceRealization_4003OutgoingLinks(View view) {

-		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getSubstitution_4004OutgoingLinks(View view) {

-		Substitution modelElement = (Substitution) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getRealization_4005OutgoingLinks(View view) {

-		Realization modelElement = (Realization) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getAbstraction_4006OutgoingLinks(View view) {

-		Abstraction modelElement = (Abstraction) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getUsage_4007OutgoingLinks(View view) {

-		Usage modelElement = (Usage) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDependency_4008OutgoingLinks(View view) {

-		Dependency modelElement = (Dependency) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getDependency_4018OutgoingLinks(View view) {

-		Dependency modelElement = (Dependency) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getElementImport_4009OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPackageImport_4010OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getPackageMerge_4011OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getProfileApplication_4012OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getTemplateBinding_4015OutgoingLinks(View view) {

-		return Collections.emptyList();

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getGeneralizationSet_4020OutgoingLinks(View view) {

-		GeneralizationSet modelElement = (GeneralizationSet) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInstanceSpecification_4021OutgoingLinks(View view) {

-		InstanceSpecification modelElement = (InstanceSpecification) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static List<UMLLinkDescriptor> getInformationFlow_4026OutgoingLinks(View view) {

-		InformationFlow modelElement = (InformationFlow) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4026

-				(modelElement));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_AssociationClass_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 AssociationClass) {

-				continue;

-			}

-			AssociationClass link = (AssociationClass) linkObject;

-			if (AssociationClassLinkEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			List targets = link.getEndTypes();

-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof Type) {

-				continue;

-			}

-			Type dst = (Type) theTarget;

-			List sources = link.getEndTypes();

-			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof Type) {

-				continue;

-			}

-			Type src = (Type) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.AssociationClass_4017, AssociationClassLinkEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Association_4001(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 Association) {

-				continue;

-			}

-			Association link = (Association) linkObject;

-			if (AssociationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			List targets = link.getEndTypes();

-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof Type) {

-				continue;

-			}

-			Type dst = (Type) theTarget;

-			List sources = link.getEndTypes();

-			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof Type) {

-				continue;

-			}

-			Type src = (Type) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_4001, AssociationEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Association_4019(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 Association) {

-				continue;

-			}

-			Association link = (Association) linkObject;

-			if (AssociationBranchEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			List targets = link.getEndTypes();

-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof Type) {

-				continue;

-			}

-			Type dst = (Type) theTarget;

-			List sources = link.getEndTypes();

-			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof Type) {

-				continue;

-			}

-			Type src = (Type) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_4019, AssociationBranchEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Generalization_4002(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();

-			result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.Generalization_4002, GeneralizationEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InterfaceRealization_4003(BehavioredClassifier container) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getInterfaceRealizations()

-				.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;

-			}

-			Interface dst = link.getContract();

-			result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.InterfaceRealization_4003, InterfaceRealizationEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Substitution_4004(Classifier container) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getSubstitutions()

-				.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;

-			}

-			Classifier dst = link.getContract();

-			Classifier src = link.getSubstitutingClassifier();

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_4004, SubstitutionEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Realization_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 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_4005, RealizationEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Abstraction_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 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_4006, AbstractionEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Usage_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 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_4007, UsageEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_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 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_4008, DependencyEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_4018(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 (DependencyBranchEditPart.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_4018, DependencyBranchEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ElementImport_4009(Namespace container) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getElementImports()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof ElementImport) {

-				continue;

-			}

-			ElementImport link = (ElementImport) linkObject;

-			if (ElementImportEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			PackageableElement dst = link.getImportedElement();

-			result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.ElementImport_4009, ElementImportEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_PackageImport_4010(Namespace container) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackageImports()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof PackageImport) {

-				continue;

-			}

-			PackageImport link = (PackageImport) linkObject;

-			if (PackageImportEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			Package dst = link.getImportedPackage();

-			result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.PackageImport_4010, PackageImportEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_PackageMerge_4011(Package container) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackageMerges()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof PackageMerge) {

-				continue;

-			}

-			PackageMerge link = (PackageMerge) linkObject;

-			if (PackageMergeEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			Package dst = link.getMergedPackage();

-			Package src = link.getReceivingPackage();

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.PackageMerge_4011, PackageMergeEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ProfileApplication_4012(Package container) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getProfileApplications()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof ProfileApplication) {

-				continue;

-			}

-			ProfileApplication link = (ProfileApplication) linkObject;

-			if (ProfileApplicationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			Profile dst = link.getAppliedProfile();

-			result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.ProfileApplication_4012, ProfileApplicationEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_TemplateBinding_4015(TemplateableElement container) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getTemplateBindings()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof TemplateBinding) {

-				continue;

-			}

-			TemplateBinding link = (TemplateBinding) linkObject;

-			if (TemplateBindingEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			TemplateableElement dst = link.getBoundElement();

-			TemplateableElement src = link.getBoundElement();

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.TemplateBinding_4015, TemplateBindingEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_GeneralizationSet_4020(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 GeneralizationSet) {

-				continue;

-			}

-			GeneralizationSet link = (GeneralizationSet) linkObject;

-			if (GeneralizationSetEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			List targets = link.getGeneralizations();

-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof Generalization) {

-				continue;

-			}

-			Generalization dst = (Generalization) theTarget;

-			List sources = link.getGeneralizations();

-			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof Generalization) {

-				continue;

-			}

-			Generalization src = (Generalization) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.GeneralizationSet_4020, GeneralizationSetEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InstanceSpecification_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 InstanceSpecification) {

-				continue;

-			}

-			InstanceSpecification link = (InstanceSpecification) linkObject;

-			if (InstanceSpecificationLinkEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			List targets = link.getSlots();

-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof Slot) {

-				continue;

-			}

-			Slot dst = (Slot) theTarget;

-			List sources = link.getSlots();

-			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof Slot) {

-				continue;

-			}

-			Slot src = (Slot) theSource;

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InstanceSpecification_4021, InstanceSpecificationLinkEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InformationFlow_4026(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_4026, InformationFlowEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_AssociationClass_4017(Type target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() || false == setting.getEObject() instanceof AssociationClass) {

-				continue;

-			}

-			AssociationClass link = (AssociationClass) setting.getEObject();

-			if (AssociationClassLinkEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			List sources = link.getEndTypes();

-			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof Type) {

-				continue;

-			}

-			Type src = (Type) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.AssociationClass_4017, AssociationClassLinkEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Association_4001(Type target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() || false == setting.getEObject() instanceof Association) {

-				continue;

-			}

-			Association link = (Association) setting.getEObject();

-			if (AssociationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			List sources = link.getEndTypes();

-			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof Type) {

-				continue;

-			}

-			Type src = (Type) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Association_4001, AssociationEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Association_4019(Type target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() || false == setting.getEObject() instanceof Association) {

-				continue;

-			}

-			Association link = (Association) setting.getEObject();

-			if (AssociationBranchEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			List sources = link.getEndTypes();

-			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof Type) {

-				continue;

-			}

-			Type src = (Type) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Association_4019, AssociationBranchEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Generalization_4002(Classifier target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(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;

-			}

-			if (false == link.eContainer() instanceof Classifier) {

-				continue;

-			}

-			Classifier container = (Classifier) link.eContainer();

-			result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.Generalization_4002, GeneralizationEditPart.VISUAL_ID));

-

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InterfaceRealization_4003(Interface target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInterfaceRealization_Contract() || false == setting.getEObject() instanceof InterfaceRealization) {

-				continue;

-			}

-			InterfaceRealization link = (InterfaceRealization) setting.getEObject();

-			if (InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			if (false == link.eContainer() instanceof BehavioredClassifier) {

-				continue;

-			}

-			BehavioredClassifier container = (BehavioredClassifier) link.eContainer();

-			result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.InterfaceRealization_4003, InterfaceRealizationEditPart.VISUAL_ID));

-

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Substitution_4004(Classifier target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getSubstitution_Contract() || false == setting.getEObject() instanceof Substitution) {

-				continue;

-			}

-			Substitution link = (Substitution) setting.getEObject();

-			if (SubstitutionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			Classifier src = link.getSubstitutingClassifier();

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Substitution_4004, SubstitutionEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Realization_4005(NamedElement target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(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_4005, RealizationEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Abstraction_4006(NamedElement target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(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_4006, AbstractionEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Usage_4007(NamedElement target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(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_4007, UsageEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_4008(NamedElement target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(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_4008, DependencyEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_4018(NamedElement target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(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 (DependencyBranchEditPart.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_4018, DependencyBranchEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_ElementImport_4009(PackageableElement target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getElementImport_ImportedElement() || false == setting.getEObject() instanceof ElementImport) {

-				continue;

-			}

-			ElementImport link = (ElementImport) setting.getEObject();

-			if (ElementImportEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			if (false == link.eContainer() instanceof Namespace) {

-				continue;

-			}

-			Namespace container = (Namespace) link.eContainer();

-			result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.ElementImport_4009, ElementImportEditPart.VISUAL_ID));

-

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_PackageImport_4010(Package target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getPackageImport_ImportedPackage() || false == setting.getEObject() instanceof PackageImport) {

-				continue;

-			}

-			PackageImport link = (PackageImport) setting.getEObject();

-			if (PackageImportEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			if (false == link.eContainer() instanceof Namespace) {

-				continue;

-			}

-			Namespace container = (Namespace) link.eContainer();

-			result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.PackageImport_4010, PackageImportEditPart.VISUAL_ID));

-

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_PackageMerge_4011(Package target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getPackageMerge_MergedPackage() || false == setting.getEObject() instanceof PackageMerge) {

-				continue;

-			}

-			PackageMerge link = (PackageMerge) setting.getEObject();

-			if (PackageMergeEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			Package src = link.getReceivingPackage();

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.PackageMerge_4011, PackageMergeEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(Element target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) {

-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.CommentAnnotatedElement_4013, CommentAnnotatedElementEditPart.VISUAL_ID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(Element target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) {

-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.ConstraintConstrainedElement_4014, ConstraintConstrainedElementEditPart.VISUAL_ID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_TemplateBinding_4015(TemplateableElement target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getTemplateBinding_BoundElement() || false == setting.getEObject() instanceof TemplateBinding) {

-				continue;

-			}

-			TemplateBinding link = (TemplateBinding) setting.getEObject();

-			if (TemplateBindingEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			TemplateableElement src = link.getBoundElement();

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.TemplateBinding_4015, TemplateBindingEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_GeneralizationSet_4020(Generalization target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralizationSet_Generalization() || false == setting.getEObject() instanceof GeneralizationSet) {

-				continue;

-			}

-			GeneralizationSet link = (GeneralizationSet) setting.getEObject();

-			if (GeneralizationSetEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			List sources = link.getGeneralizations();

-			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof Generalization) {

-				continue;

-			}

-			Generalization src = (Generalization) theSource;

-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.GeneralizationSet_4020, GeneralizationSetEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_TimeObservation_Event_4024(NamedElement target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getTimeObservation_Event()) {

-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.TimeObservationEvent_4024, ConnectorTimeObservationEditPart.VISUAL_ID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_DurationObservation_Event_4025(NamedElement target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getDurationObservation_Event()) {

-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.DurationObservationEvent_4025, ConnectorDurationObservationEditPart.VISUAL_ID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InformationFlow_4026(NamedElement target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(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_4026, InformationFlowEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_Context_8500(Namespace target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_Context()) {

-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.ConstraintContext_8500, ContextLinkEditPart.VISUAL_ID));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_AssociationClass_4017(Type 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 AssociationClass) {

-				continue;

-			}

-			AssociationClass link = (AssociationClass) linkObject;

-			if (AssociationClassLinkEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			List targets = link.getEndTypes();

-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof Type) {

-				continue;

-			}

-			Type dst = (Type) theTarget;

-			List sources = link.getEndTypes();

-			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof Type) {

-				continue;

-			}

-			Type src = (Type) theSource;

-			if (src != source) {

-				continue;

-			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.AssociationClass_4017, AssociationClassLinkEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Association_4001(Type 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 Association) {

-				continue;

-			}

-			Association link = (Association) linkObject;

-			if (AssociationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			List targets = link.getEndTypes();

-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof Type) {

-				continue;

-			}

-			Type dst = (Type) theTarget;

-			List sources = link.getEndTypes();

-			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof Type) {

-				continue;

-			}

-			Type src = (Type) theSource;

-			if (src != source) {

-				continue;

-			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_4001, AssociationEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Association_4019(Type 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 Association) {

-				continue;

-			}

-			Association link = (Association) linkObject;

-			if (AssociationBranchEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			List targets = link.getEndTypes();

-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof Type) {

-				continue;

-			}

-			Type dst = (Type) theTarget;

-			List sources = link.getEndTypes();

-			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof Type) {

-				continue;

-			}

-			Type src = (Type) theSource;

-			if (src != source) {

-				continue;

-			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_4019, AssociationBranchEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Substitution_4004(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.getSubstitutions()

-				.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;

-			}

-			Classifier dst = link.getContract();

-			Classifier src = link.getSubstitutingClassifier();

-			if (src != source) {

-				continue;

-			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_4004, SubstitutionEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Realization_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 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_4005, RealizationEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Abstraction_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 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_4006, AbstractionEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Usage_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 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_4007, UsageEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_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 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_4008, DependencyEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_4018(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 (DependencyBranchEditPart.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_4018, DependencyBranchEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_PackageMerge_4011(Package 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.getPackageMerges()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof PackageMerge) {

-				continue;

-			}

-			PackageMerge link = (PackageMerge) linkObject;

-			if (PackageMergeEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			Package dst = link.getMergedPackage();

-			Package src = link.getReceivingPackage();

-			if (src != source) {

-				continue;

-			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.PackageMerge_4011, PackageMergeEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(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_4013, CommentAnnotatedElementEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(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_4014, ConstraintConstrainedElementEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_TemplateBinding_4015(TemplateableElement source) {

-		TemplateableElement 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 TemplateableElement) {

-				container = (TemplateableElement) element;

-			}

-		}

-		if (container == null) {

-			return Collections.emptyList();

-		}

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getTemplateBindings()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof TemplateBinding) {

-				continue;

-			}

-			TemplateBinding link = (TemplateBinding) linkObject;

-			if (TemplateBindingEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			TemplateableElement dst = link.getBoundElement();

-			TemplateableElement src = link.getBoundElement();

-			if (src != source) {

-				continue;

-			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.TemplateBinding_4015, TemplateBindingEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_GeneralizationSet_4020(Generalization 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 GeneralizationSet) {

-				continue;

-			}

-			GeneralizationSet link = (GeneralizationSet) linkObject;

-			if (GeneralizationSetEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

-				continue;

-			}

-			List targets = link.getGeneralizations();

-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof Generalization) {

-				continue;

-			}

-			Generalization dst = (Generalization) theTarget;

-			List sources = link.getGeneralizations();

-			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof Generalization) {

-				continue;

-			}

-			Generalization src = (Generalization) theSource;

-			if (src != source) {

-				continue;

-			}

-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.GeneralizationSet_4020, GeneralizationSetEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4024(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_4024, ConnectorTimeObservationEditPart.VISUAL_ID));

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4025(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_4025, ConnectorDurationObservationEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_InformationFlow_4026(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_4026, InformationFlowEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_Context_8500(Constraint source) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		Namespace destination = source.getContext();

-		if (destination == null) {

-			return result;

-		}

-		result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.ConstraintContext_8500, ContextLinkEditPart.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);

-		}

-	};

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDocumentProvider.java
deleted file mode 100644
index ab4180e603c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDocumentProvider.java
+++ /dev/null
@@ -1,1001 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.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 {

-						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 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/*<org.eclipse.emf.ecore.resource.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLInitDiagramFileAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLInitDiagramFileAction.java
deleted file mode 100644
index 0e38116b2d5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLInitDiagramFileAction.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.parts.ModelEditPart;

-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,

-				ModelEditPart.MODEL_ID));

-		UMLDiagramEditorUtil.runWizard(getShell(), wizard, "InitDiagramFile"); //$NON-NLS-1$

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLLinkDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLLinkDescriptor.java
deleted file mode 100644
index 35061fe805f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLLinkDescriptor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLMatchingStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLMatchingStrategy.java
deleted file mode 100644
index 9d62ca1fdc1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLMatchingStrategy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNewDiagramFileWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNewDiagramFileWizard.java
deleted file mode 100644
index fbcc88187c5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNewDiagramFileWizard.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.parts.ModelEditPart;

-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,

-				ModelEditPart.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, "PapyrusUMLClass_diagram")); //$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 != ModelEditPart.VISUAL_ID) {

-							return CommandResult.newErrorCommandResult(

-									Messages.UMLNewDiagramFileWizard_IncorrectRootError);

-						}

-						Diagram diagram =

-								ViewService.createDiagram(

-										diagramRootElementSelectionPage.getModelElement(), ModelEditPart.MODEL_ID,

-										UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

-						diagramResource.getContents().add(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()),

-							ModelEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNodeDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNodeDescriptor.java
deleted file mode 100644
index 41760df4be0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNodeDescriptor.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLPaletteFactory.java
deleted file mode 100644
index 619059fc40f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLPaletteFactory.java
+++ /dev/null
@@ -1,917 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;

-import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool;

-

-/**

- * @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 CLAZZ_TOOL_CLASS = "clazz.tool.class";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_CLASSIFIERTEMPLATEPARAMETER = "clazz.tool.classifiertemplateparameter";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_COMMENT = "clazz.tool.comment";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_COMPONENT = "clazz.tool.component";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_CONSTRAINT = "clazz.tool.constraint";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_DATATYPE = "clazz.tool.datatype";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CREATEDURATIONOBSERVATION7CREATIONTOOL = "createDurationObservation7CreationTool";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_ENUMERATION = "clazz.tool.enumeration";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_ENUMERATIONLITERAL = "clazz.tool.enumerationliteral";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_INTERFACE = "clazz.tool.interface";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_INSTANCESPECIFICATION = "clazz.tool.instancespecification";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_INFORMATIONITEM = "clazz.tool.informationitem";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_PRIMITIVETYPE = "clazz.tool.primitivetype";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_MODEL = "clazz.tool.model";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_OPERATION = "clazz.tool.operation";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_OPERATIONTEMPLATEPARAMETER = "clazz.tool.OperationTemplateParameter";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_PACKAGE = "clazz.tool.package";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_PROPERTY = "clazz.tool.property";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_RECEPTION = "clazz.tool.reception";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_REDEFINABLETEMPLATESIGNATURE = "clazz.tool.redefinabletemplatesignature";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_SIGNAL = "clazz.tool.signal";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_SLOT = "clazz.tool.slot";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_TEMPLATEPARAMETER = "clazz.tool.templateparameter";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_TEMPLATESIGNATURE = "clazz.tool.templatesignature";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CREATETIMEOBSERVATION22CREATIONTOOL = "createTimeObservation22CreationTool";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_CONNECTABLEELEMENTTEMPLATEPARAMETER = "clazz.tool.connectableelementtemplateparameter";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_ABSTRACTION = "clazz.tool.abstraction";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_ASSOCIATION = "clazz.tool.association";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_ASSOCIATIONBRANCH = "clazz.tool.associationbranch";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_ASSOCIATIONCLASS = "clazz.tool.associationclass";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_CONTAINMENTLINK = "clazz.tool.containmentlink";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_DEPENDENCY = "clazz.tool.dependency";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_DEPENDENCYBRANCH = "clazz.tool.dependencybranch";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_ELEMENTIMPORT = "clazz.tool.elementimport";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_GENERALIZATION = "clazz.tool.generalization";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_GENERALIZATIONSET = "clazz.tool.generalizationset";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_INFORMATIONFLOWLINK = "clazz.tool.informationflowlink";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_INSTANCESPECIFICATIONLINK = "clazz.tool.instancespecificationlink";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_INTERFACEREALIZATION = "clazz.tool.interfacerealization";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_LINK = "clazz.tool.link";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_PACKAGEIMPORT = "clazz.tool.packageimport";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_PACKAGEMERGE = "clazz.tool.packagemerge";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_PROFILEAPPLICATION = "clazz.tool.profileapplication";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_REALIZATION = "clazz.tool.realization";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_SUBSTITUTION = "clazz.tool.substitution";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_USAGE = "clazz.tool.usage";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CLAZZ_TOOL_TEMPLATEBINDING = "clazz.tool.templatebinding";//$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	private final static String CREATECONTEXTLINK22CREATIONTOOL = "createContextLink22CreationTool";//$NON-NLS-1$

-

-	/**

-	 * @generated

-	 */

-	public UMLPaletteFactory() {

-

-	}

-

-	/**

-	 * @generated

-	 */

-	public Tool createTool(String toolId) {

-		if (toolId.equals(CLAZZ_TOOL_CLASS)) {

-			return createClass1CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_CLASSIFIERTEMPLATEPARAMETER)) {

-			return createClassifierTemplateParameter2CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_COMMENT)) {

-			return createComment5CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_COMPONENT)) {

-			return createComponent4CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_CONSTRAINT)) {

-			return createConstraint5CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_DATATYPE)) {

-			return createDataType6CreationTool();

-		}

-		if (toolId.equals(CREATEDURATIONOBSERVATION7CREATIONTOOL)) {

-			return createDurationObservation7CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_ENUMERATION)) {

-			return createEnumeration8CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_ENUMERATIONLITERAL)) {

-			return createEnumerationliteral9CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_INTERFACE)) {

-			return createInterface10CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_INSTANCESPECIFICATION)) {

-			return createInstanceSpecification11CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_INFORMATIONITEM)) {

-			return createInformationItem12CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_PRIMITIVETYPE)) {

-			return createPrimitiveType13CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_MODEL)) {

-			return createModel14CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_OPERATION)) {

-			return createOperation15CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_OPERATIONTEMPLATEPARAMETER)) {

-			return createOperationTemplateParameterCreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_PACKAGE)) {

-			return createPackage17CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_PROPERTY)) {

-			return createProperty18CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_RECEPTION)) {

-			return createReception19CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_REDEFINABLETEMPLATESIGNATURE)) {

-			return createRedefinableTemplateSignature20CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_SIGNAL)) {

-			return createSignal21CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_SLOT)) {

-			return createSlot22CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_TEMPLATEPARAMETER)) {

-			return createTemplateParameter23CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_TEMPLATESIGNATURE)) {

-			return createTemplateSignatureCreationTool();

-		}

-		if (toolId.equals(CREATETIMEOBSERVATION22CREATIONTOOL)) {

-			return createTimeObservation22CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_CONNECTABLEELEMENTTEMPLATEPARAMETER)) {

-			return createConnectableElementTemplateParameter26CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_ABSTRACTION)) {

-			return createAbstraction1CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_ASSOCIATION)) {

-			return createAssociation2CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_ASSOCIATIONBRANCH)) {

-			return createAssociationBranch3CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_ASSOCIATIONCLASS)) {

-			return createAssociationClass4CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_CONTAINMENTLINK)) {

-			return createContainmentLink5CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_DEPENDENCY)) {

-			return createDependency6CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_DEPENDENCYBRANCH)) {

-			return createDependencyBranch7CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_ELEMENTIMPORT)) {

-			return createElementImport8CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_GENERALIZATION)) {

-			return createGeneralization9CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_GENERALIZATIONSET)) {

-			return createGeneralizationSet10CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_INFORMATIONFLOWLINK)) {

-			return createInformationFlowLinkCreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_INSTANCESPECIFICATIONLINK)) {

-			return createInstanceSpecificationLinkCreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_INTERFACEREALIZATION)) {

-			return createInterfaceRealization13CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_LINK)) {

-			return createLink14CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_PACKAGEIMPORT)) {

-			return createPackageImport15CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_PACKAGEMERGE)) {

-			return createPackageMerge16CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_PROFILEAPPLICATION)) {

-			return createProfileApplication17CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_REALIZATION)) {

-			return createRealization18CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_SUBSTITUTION)) {

-			return createSubstitution19CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_USAGE)) {

-			return createUsage20CreationTool();

-		}

-		if (toolId.equals(CLAZZ_TOOL_TEMPLATEBINDING)) {

-			return createTemplateBinding21CreationTool();

-		}

-		if (toolId.equals(CREATECONTEXTLINK22CREATIONTOOL)) {

-			return createContextLink22CreationTool();

-		}

-		// default return: null

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Object getTemplate(String templateId) {

-

-		// default return: null

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createClass1CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(5);

-		types.add(UMLElementTypes.Class_3004);

-		types.add(UMLElementTypes.Class_3008);

-		types.add(UMLElementTypes.Class_3010);

-		types.add(UMLElementTypes.Class_3014);

-		types.add(UMLElementTypes.Class_2008);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createClassifierTemplateParameter2CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.ClassifierTemplateParameter_3031);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createComment5CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(2);

-		types.add(UMLElementTypes.Comment_3028);

-		types.add(UMLElementTypes.Comment_2012);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createComponent4CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(2);

-		types.add(UMLElementTypes.Component_2002);

-		types.add(UMLElementTypes.Component_3021);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createConstraint5CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(2);

-		types.add(UMLElementTypes.Constraint_3029);

-		types.add(UMLElementTypes.Constraint_2011);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createDataType6CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(5);

-		types.add(UMLElementTypes.DataType_3027);

-		types.add(UMLElementTypes.DataType_2010);

-		types.add(UMLElementTypes.DataType_3044);

-		types.add(UMLElementTypes.DataType_3045);

-		types.add(UMLElementTypes.DataType_3043);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createDurationObservation7CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.DurationObservation_2095);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createEnumeration8CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(5);

-		types.add(UMLElementTypes.Enumeration_3025);

-		types.add(UMLElementTypes.Enumeration_2006);

-		types.add(UMLElementTypes.Enumeration_3052);

-		types.add(UMLElementTypes.Enumeration_3053);

-		types.add(UMLElementTypes.Enumeration_3054);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createEnumerationliteral9CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.EnumerationLiteral_3017);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createInterface10CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(5);

-		types.add(UMLElementTypes.Interface_2004);

-		types.add(UMLElementTypes.Interface_3023);

-		types.add(UMLElementTypes.Interface_3036);

-		types.add(UMLElementTypes.Interface_3037);

-		types.add(UMLElementTypes.Interface_3038);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createInstanceSpecification11CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(2);

-		types.add(UMLElementTypes.InstanceSpecification_2001);

-		types.add(UMLElementTypes.InstanceSpecification_3020);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createInformationItem12CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(2);

-		types.add(UMLElementTypes.InformationItem_2099);

-		types.add(UMLElementTypes.InformationItem_3040);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createPrimitiveType13CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(5);

-		types.add(UMLElementTypes.PrimitiveType_3026);

-		types.add(UMLElementTypes.PrimitiveType_2009);

-		types.add(UMLElementTypes.PrimitiveType_3047);

-		types.add(UMLElementTypes.PrimitiveType_3046);

-		types.add(UMLElementTypes.PrimitiveType_3048);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createModel14CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(2);

-		types.add(UMLElementTypes.Model_2005);

-		types.add(UMLElementTypes.Model_3024);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createOperation15CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(5);

-		types.add(UMLElementTypes.Operation_3003);

-		types.add(UMLElementTypes.Operation_3007);

-		types.add(UMLElementTypes.Operation_3013);

-		types.add(UMLElementTypes.Operation_3019);

-		types.add(UMLElementTypes.Operation_3042);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createOperationTemplateParameterCreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.OperationTemplateParameter_3035);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createPackage17CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(2);

-		types.add(UMLElementTypes.Package_3009);

-		types.add(UMLElementTypes.Package_2007);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createProperty18CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(6);

-		types.add(UMLElementTypes.Property_3002);

-		types.add(UMLElementTypes.Property_3005);

-		types.add(UMLElementTypes.Property_3006);

-		types.add(UMLElementTypes.Property_3012);

-		types.add(UMLElementTypes.Property_3018);

-		types.add(UMLElementTypes.Property_3041);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createReception19CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(2);

-		types.add(UMLElementTypes.Reception_3011);

-		types.add(UMLElementTypes.Reception_3039);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createRedefinableTemplateSignature20CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.RedefinableTemplateSignature_3015);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createSignal21CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(5);

-		types.add(UMLElementTypes.Signal_2003);

-		types.add(UMLElementTypes.Signal_3022);

-		types.add(UMLElementTypes.Signal_3050);

-		types.add(UMLElementTypes.Signal_3051);

-		types.add(UMLElementTypes.Signal_3049);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createSlot22CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.Slot_3030);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createTemplateParameter23CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.TemplateParameter_3016);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createTemplateSignatureCreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.TemplateSignature_3033);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createTimeObservation22CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.TimeObservation_2096);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createConnectableElementTemplateParameter26CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.ConnectableElementTemplateParameter_3034);

-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createAbstraction1CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.Abstraction_4006);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createAssociation2CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.Association_4001);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createAssociationBranch3CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.Association_4019);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createAssociationClass4CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.AssociationClass_4017);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createContainmentLink5CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.Link_4023);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createDependency6CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.Dependency_4008);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createDependencyBranch7CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.Dependency_4018);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createElementImport8CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.ElementImport_4009);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createGeneralization9CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.Generalization_4002);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createGeneralizationSet10CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.GeneralizationSet_4020);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createInformationFlowLinkCreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.InformationFlow_4026);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createInstanceSpecificationLinkCreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.InstanceSpecification_4021);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createInterfaceRealization13CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.InterfaceRealization_4003);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createLink14CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(4);

-		types.add(UMLElementTypes.CommentAnnotatedElement_4013);

-		types.add(UMLElementTypes.TimeObservationEvent_4024);

-		types.add(UMLElementTypes.DurationObservationEvent_4025);

-		types.add(UMLElementTypes.ConstraintConstrainedElement_4014);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createPackageImport15CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.PackageImport_4010);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createPackageMerge16CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.PackageMerge_4011);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createProfileApplication17CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.ProfileApplication_4012);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createRealization18CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.Realization_4005);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createSubstitution19CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.Substitution_4004);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createUsage20CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.Usage_4007);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createTemplateBinding21CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.TemplateBinding_4015);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Tool createContextLink22CreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

-		types.add(UMLElementTypes.ConstraintContext_8500);

-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

-		return tool;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLUriEditorInputTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLUriEditorInputTester.java
deleted file mode 100644
index f99ae7df2ad..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLUriEditorInputTester.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.part;

-

-import org.eclipse.core.expressions.PropertyTester;

-import org.eclipse.emf.common.ui.URIEditorInput;

-

-/**

- * @generated

- */

-public class UMLUriEditorInputTester extends PropertyTester {

-

-	/**

-	 * @generated

-	 */

-	public boolean test(Object receiver, String method, Object[] args, Object expectedValue) {

-		if (false == receiver instanceof URIEditorInput) {

-			return false;

-		}

-		URIEditorInput editorInput = (URIEditorInput) receiver;

-		return "PapyrusUMLClass_diagram".equals(editorInput.getURI().fileExtension()); //$NON-NLS-1$

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java
deleted file mode 100644
index 7d9f087dc84..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java
+++ /dev/null
@@ -1,2057 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.structure.DiagramStructure;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.*;

-import org.eclipse.uml2.uml.Package;

-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.clazz/debug/visualID"; //$NON-NLS-1$

-

-	/**

-	 * @generated

-	 */

-	public static int getVisualID(View view) {

-		if (view instanceof Diagram) {

-			if (ModelEditPart.MODEL_ID.equals(view.getType())) {

-				return ModelEditPart.VISUAL_ID;

-			} else {

-				return -1;

-			}

-		}

-		return org.eclipse.papyrus.uml.diagram.clazz.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.clazz.part.UMLVisualIDRegistry.getModelID(containerView);

-		if (!ModelEditPart.MODEL_ID.equals(containerModelID)) {

-			return -1;

-		}

-		int containerVisualID;

-		if (ModelEditPart.MODEL_ID.equals(containerModelID)) {

-			containerVisualID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getVisualID(containerView);

-		} else {

-			if (containerView instanceof Diagram) {

-				containerVisualID = ModelEditPart.VISUAL_ID;

-			} else {

-				return -1;

-			}

-		}

-		switch (containerVisualID) {

-		case ModelEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

-				return DependencyNodeEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getAssociationClass().isSuperTypeOf(domainElement.eClass())) {

-				return AssociationClassEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

-				return AssociationNodeEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass())) {

-				return InstanceSpecificationEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

-				return ComponentEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

-				return SignalEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

-				return InterfaceEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) {

-				return ModelEditPartTN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

-				return EnumerationEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) {

-				return PackageEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

-				return InformationItemEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

-				return ClassEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

-				return PrimitiveTypeEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

-				return DataTypeEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

-				return ConstraintEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

-				return CommentEditPart.VISUAL_ID;

-			}

-			if (NotationPackage.eINSTANCE.getDiagram().isSuperTypeOf(domainElement.eClass())) {

-				return ShortCutDiagramEditPart.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.getNamedElement().isSuperTypeOf(domainElement.eClass())) {

-				return DefaultNamedElementEditPart.VISUAL_ID;

-			}

-			break;

-		case ComponentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getRedefinableTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return RedefinableTemplateSignatureEditPart.VISUAL_ID;

-			}

-			break;

-		case SignalEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getRedefinableTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return RedefinableTemplateSignatureEditPart.VISUAL_ID;

-			}

-			break;

-		case InterfaceEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getRedefinableTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return RedefinableTemplateSignatureEditPart.VISUAL_ID;

-			}

-			break;

-		case ModelEditPartTN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getRedefinableTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return RedefinableTemplateSignatureEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return TemplateSignatureEditPart.VISUAL_ID;

-			}

-			break;

-		case PackageEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getRedefinableTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return RedefinableTemplateSignatureEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return TemplateSignatureEditPart.VISUAL_ID;

-			}

-			break;

-		case ClassEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getRedefinableTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return RedefinableTemplateSignatureEditPart.VISUAL_ID;

-			}

-			break;

-		case DataTypeEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getRedefinableTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return RedefinableTemplateSignatureEditPart.VISUAL_ID;

-			}

-			break;

-		case ComponentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getRedefinableTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return RedefinableTemplateSignatureEditPart.VISUAL_ID;

-			}

-			break;

-		case SignalEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getRedefinableTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return RedefinableTemplateSignatureEditPart.VISUAL_ID;

-			}

-			break;

-		case InterfaceEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getRedefinableTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return RedefinableTemplateSignatureEditPart.VISUAL_ID;

-			}

-			break;

-		case ModelEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getRedefinableTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return RedefinableTemplateSignatureEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return TemplateSignatureEditPart.VISUAL_ID;

-			}

-			break;

-		case PackageEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getRedefinableTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return RedefinableTemplateSignatureEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return TemplateSignatureEditPart.VISUAL_ID;

-			}

-			break;

-		case ClassEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getRedefinableTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return RedefinableTemplateSignatureEditPart.VISUAL_ID;

-			}

-			break;

-		case DataTypeEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getRedefinableTemplateSignature().isSuperTypeOf(domainElement.eClass())) {

-				return RedefinableTemplateSignatureEditPart.VISUAL_ID;

-			}

-			break;

-		case ClassAttributeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

-				return PropertyForClassEditPart.VISUAL_ID;

-			}

-			break;

-		case ClassOperationCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getReception().isSuperTypeOf(domainElement.eClass())) {

-				return ReceptionEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

-				return OperationForClassEditPart.VISUAL_ID;

-			}

-			break;

-		case ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

-				return NestedClassForClassEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

-				return NestedInterfaceForClassEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

-				return NestedEnumerationForClassEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

-				return NestedPrimitiveTypeForClassEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

-				return NestedDataTypeForClassEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

-				return NestedSignalForClassEditPart.VISUAL_ID;

-			}

-			break;

-		case ComponentAttributeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

-				return PropertyForComponentEditPart.VISUAL_ID;

-			}

-			break;

-		case ComponentOperationCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

-				return OperationForComponentEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getReception().isSuperTypeOf(domainElement.eClass())) {

-				return ReceptionEditPart.VISUAL_ID;

-			}

-			break;

-		case ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

-				return NestedClassForComponentEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

-				return NestedInterfaceForComponentEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

-				return NestedEnumerationForComponentEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

-				return NestedPrimitiveTypeForComponentEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

-				return NestedDataTypeForComponentEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

-				return NestedSignalForComponentEditPart.VISUAL_ID;

-			}

-			break;

-		case SignalAttributeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

-				return PropertyForSignalEditPart.VISUAL_ID;

-			}

-			break;

-		case InterfaceAttributeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

-				return PropertyForInterfaceEditPart.VISUAL_ID;

-			}

-			break;

-		case InterfaceOperationCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

-				return OperationForInterfaceEditpart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getReception().isSuperTypeOf(domainElement.eClass())) {

-				return ReceptionInInterfaceEditPart.VISUAL_ID;

-			}

-			break;

-		case InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

-				return NestedClassForInterfaceEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

-				return NestedInterfaceForInterfaceEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

-				return NestedEnumerationForInterfaceEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

-				return NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

-				return NestedDataTypeForInterfaceEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

-				return NestedSignalForInterfaceEditPart.VISUAL_ID;

-			}

-			break;

-		case PrimitiveTypeAttributeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

-				return PropertyforPrimitiveTypeEditPart.VISUAL_ID;

-			}

-			break;

-		case PrimitiveTypeOperationCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

-				return OperationForPrimitiveTypeEditPart.VISUAL_ID;

-			}

-			break;

-		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

-				return PropertyforDataTypeEditPart.VISUAL_ID;

-			}

-			break;

-		case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

-				return OperationForDataTypeEditPart.VISUAL_ID;

-			}

-			break;

-		case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass())) {

-				return InstanceSpecificationEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

-				return ComponentEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

-				return SignalEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

-				return InterfaceEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) {

-				return ModelEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

-				return EnumerationEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) {

-				return PackageEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

-				return ClassEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

-				return PrimitiveTypeEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

-				return DataTypeEditPartCN.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.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

-				return InformationItemEditPartCN.VISUAL_ID;

-			}

-			break;

-		case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass())) {

-				return InstanceSpecificationEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

-				return ComponentEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

-				return SignalEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

-				return InterfaceEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) {

-				return ModelEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

-				return EnumerationEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) {

-				return PackageEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

-				return ClassEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

-				return PrimitiveTypeEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

-				return DataTypeEditPartCN.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.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

-				return InformationItemEditPartCN.VISUAL_ID;

-			}

-			break;

-		case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {

-				return EnumerationLiteralEditPart.VISUAL_ID;

-			}

-			break;

-		case InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getSlot().isSuperTypeOf(domainElement.eClass())) {

-				return SlotEditPart.VISUAL_ID;

-			}

-			break;

-		case ClassAttributeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

-				return PropertyForClassEditPart.VISUAL_ID;

-			}

-			break;

-		case ClassOperationCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getReception().isSuperTypeOf(domainElement.eClass())) {

-				return ReceptionEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

-				return OperationForClassEditPart.VISUAL_ID;

-			}

-			break;

-		case ClassNestedClassifierCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

-				return NestedClassForClassEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

-				return NestedInterfaceForClassEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

-				return NestedEnumerationForClassEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

-				return NestedPrimitiveTypeForClassEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

-				return NestedDataTypeForClassEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

-				return NestedSignalForClassEditPart.VISUAL_ID;

-			}

-			break;

-		case ComponentAttributeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

-				return PropertyForComponentEditPart.VISUAL_ID;

-			}

-			break;

-		case ComponentOperationCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

-				return OperationForComponentEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getReception().isSuperTypeOf(domainElement.eClass())) {

-				return ReceptionEditPart.VISUAL_ID;

-			}

-			break;

-		case ComponentNestedClassifierCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

-				return NestedClassForComponentEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

-				return NestedInterfaceForComponentEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

-				return NestedEnumerationForComponentEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

-				return NestedPrimitiveTypeForComponentEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

-				return NestedDataTypeForComponentEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

-				return NestedSignalForComponentEditPart.VISUAL_ID;

-			}

-			break;

-		case InterfaceAttributeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

-				return PropertyForInterfaceEditPart.VISUAL_ID;

-			}

-			break;

-		case InterfaceOperationCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

-				return OperationForInterfaceEditpart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getReception().isSuperTypeOf(domainElement.eClass())) {

-				return ReceptionInInterfaceEditPart.VISUAL_ID;

-			}

-			break;

-		case InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

-				return NestedClassForInterfaceEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

-				return NestedInterfaceForInterfaceEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

-				return NestedEnumerationForInterfaceEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

-				return NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

-				return NestedDataTypeForInterfaceEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

-				return NestedSignalForInterfaceEditPart.VISUAL_ID;

-			}

-			break;

-		case PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

-				return PropertyforPrimitiveTypeEditPart.VISUAL_ID;

-			}

-			break;

-		case PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

-				return OperationForPrimitiveTypeEditPart.VISUAL_ID;

-			}

-			break;

-		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

-				return PropertyforDataTypeEditPart.VISUAL_ID;

-			}

-			break;

-		case DataTypeOperationCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

-				return OperationForDataTypeEditPart.VISUAL_ID;

-			}

-			break;

-		case AssociationClassAttributeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

-				return PropertyForComponentEditPart.VISUAL_ID;

-			}

-			break;

-		case InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getSlot().isSuperTypeOf(domainElement.eClass())) {

-				return SlotEditPart.VISUAL_ID;

-			}

-			break;

-		case SignalAttributeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

-				return PropertyForSignalEditPart.VISUAL_ID;

-			}

-			break;

-		case ModelPackageableElementCompartmentEditPartTN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass())) {

-				return InstanceSpecificationEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

-				return ComponentEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

-				return SignalEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

-				return InterfaceEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) {

-				return ModelEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

-				return EnumerationEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) {

-				return PackageEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

-				return ClassEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

-				return PrimitiveTypeEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

-				return DataTypeEditPartCN.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.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

-				return InformationItemEditPartCN.VISUAL_ID;

-			}

-			break;

-		case PackagePackageableElementCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass())) {

-				return InstanceSpecificationEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

-				return ComponentEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

-				return SignalEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

-				return InterfaceEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) {

-				return ModelEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

-				return EnumerationEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) {

-				return PackageEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

-				return ClassEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

-				return PrimitiveTypeEditPartCN.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

-				return DataTypeEditPartCN.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.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

-				return InformationItemEditPartCN.VISUAL_ID;

-			}

-			break;

-		case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {

-				return EnumerationLiteralEditPart.VISUAL_ID;

-			}

-			break;

-		case AssociationClassOperationCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

-				return OperationForComponentEditPart.VISUAL_ID;

-			}

-			break;

-		case AssociationClassNestedClassifierCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

-				return NestedClassForComponentEditPart.VISUAL_ID;

-			}

-			break;

-		case RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getClassifierTemplateParameter().isSuperTypeOf(domainElement.eClass())) {

-				return ClassifierTemplateParameterEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getConnectableElementTemplateParameter().isSuperTypeOf(domainElement.eClass())) {

-				return ConnectableElementTemplateParameterEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getOperationTemplateParameter().isSuperTypeOf(domainElement.eClass())) {

-				return OperationTemplateParameterEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getTemplateParameter().isSuperTypeOf(domainElement.eClass())) {

-				return TemplateParameterEditPart.VISUAL_ID;

-			}

-			break;

-		case TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getClassifierTemplateParameter().isSuperTypeOf(domainElement.eClass())) {

-				return ClassifierTemplateParameterEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getOperationTemplateParameter().isSuperTypeOf(domainElement.eClass())) {

-				return OperationTemplateParameterEditPart.VISUAL_ID;

-			}

-			if (UMLPackage.eINSTANCE.getTemplateParameter().isSuperTypeOf(domainElement.eClass())) {

-				return TemplateParameterEditPart.VISUAL_ID;

-			}

-			break;

-		}

-		return -1;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static boolean canCreateNode(View containerView, int nodeVisualID) {

-		String containerModelID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getModelID(containerView);

-		if (!ModelEditPart.MODEL_ID.equals(containerModelID)) {

-			return false;

-		}

-		int containerVisualID;

-		if (ModelEditPart.MODEL_ID.equals(containerModelID)) {

-			containerVisualID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getVisualID(containerView);

-		} else {

-			if (containerView instanceof Diagram) {

-				containerVisualID = ModelEditPart.VISUAL_ID;

-			} else {

-				return false;

-			}

-		}

-		switch (containerVisualID) {

-		case ModelEditPart.VISUAL_ID:

-			if (DependencyNodeEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AssociationClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AssociationNodeEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InstanceSpecificationEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (SignalEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ModelEditPartTN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (EnumerationEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PackageEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InformationItemEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PrimitiveTypeEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (DataTypeEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ConstraintEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (CommentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ShortCutDiagramEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (DurationObservationEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (TimeObservationEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (DefaultNamedElementEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case DependencyNodeEditPart.VISUAL_ID:

-			if (MultiDependencyLabelEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case AssociationClassEditPart.VISUAL_ID:

-			if (AssociationClassNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AssociationClassAttributeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AssociationClassOperationCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AssociationClassNestedClassifierCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InstanceSpecificationEditPart.VISUAL_ID:

-			if (InstanceSpecificationNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ComponentEditPart.VISUAL_ID:

-			if (ComponentNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ComponentAttributeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ComponentOperationCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ComponentNestedClassifierCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (RedefinableTemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case SignalEditPart.VISUAL_ID:

-			if (SignalNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (SignalAttributeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (RedefinableTemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InterfaceEditPart.VISUAL_ID:

-			if (InterfaceNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InterfaceAttributeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InterfaceOperationCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (RedefinableTemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ModelEditPartTN.VISUAL_ID:

-			if (ModelNameEditPartTN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ModelPackageableElementCompartmentEditPartTN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (RedefinableTemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (TemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case EnumerationEditPart.VISUAL_ID:

-			if (EnumerationNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case PackageEditPart.VISUAL_ID:

-			if (PackageNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PackagePackageableElementCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (RedefinableTemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (TemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InformationItemEditPart.VISUAL_ID:

-			if (InformationItemNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ClassEditPart.VISUAL_ID:

-			if (ClassNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ClassAttributeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ClassOperationCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ClassNestedClassifierCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (RedefinableTemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ContainmentCircleEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case PrimitiveTypeEditPart.VISUAL_ID:

-			if (PrimitiveTypeNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PrimitiveTypeOperationCompartmentEditPart.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;

-			}

-			if (RedefinableTemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ConstraintEditPart.VISUAL_ID:

-			if (ConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ConstraintBodyEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case CommentEditPart.VISUAL_ID:

-			if (CommentBodyEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ShortCutDiagramEditPart.VISUAL_ID:

-			if (DiagramNameEditPart.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 DefaultNamedElementEditPart.VISUAL_ID:

-			if (DefaultNamedElementNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case RedefinableTemplateSignatureEditPart.VISUAL_ID:

-			if (RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case TemplateSignatureEditPart.VISUAL_ID:

-			if (TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InstanceSpecificationEditPartCN.VISUAL_ID:

-			if (InstanceSpecificationNameEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ComponentEditPartCN.VISUAL_ID:

-			if (ComponentNameEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ComponentAttributeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ComponentOperationCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (RedefinableTemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case SignalEditPartCN.VISUAL_ID:

-			if (SignalNameEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (SignalAttributeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (RedefinableTemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InterfaceEditPartCN.VISUAL_ID:

-			if (InterfaceNameEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InterfaceAttributeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InterfaceOperationCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (RedefinableTemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ModelEditPartCN.VISUAL_ID:

-			if (ModelNameEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ModelPackageableElementCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (RedefinableTemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (TemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case EnumerationEditPartCN.VISUAL_ID:

-			if (EnumerationNameEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case PackageEditPartCN.VISUAL_ID:

-			if (PackageNameEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PackagePackageableElementCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (RedefinableTemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (TemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InformationItemEditPartCN.VISUAL_ID:

-			if (InformationItemNameEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ClassEditPartCN.VISUAL_ID:

-			if (ClassNameEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ClassAttributeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ClassOperationCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (RedefinableTemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case PrimitiveTypeEditPartCN.VISUAL_ID:

-			if (PrimitiveTypeNameEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PrimitiveTypeAttributeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PrimitiveTypeOperationCompartmentEditPartCN.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;

-			}

-			if (RedefinableTemplateSignatureEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case CommentEditPartCN.VISUAL_ID:

-			if (CommentBodyEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ConstraintEditPartCN.VISUAL_ID:

-			if (ConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ConstraintBodyEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ClassAttributeCompartmentEditPartCN.VISUAL_ID:

-			if (PropertyForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ClassOperationCompartmentEditPartCN.VISUAL_ID:

-			if (ReceptionEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (OperationForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-			if (NestedClassForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedInterfaceForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedEnumerationForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedPrimitiveTypeForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedDataTypeForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedSignalForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ComponentAttributeCompartmentEditPartCN.VISUAL_ID:

-			if (PropertyForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ComponentOperationCompartmentEditPartCN.VISUAL_ID:

-			if (OperationForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ReceptionEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-			if (NestedClassForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedInterfaceForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedEnumerationForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedPrimitiveTypeForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedDataTypeForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedSignalForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case SignalAttributeCompartmentEditPartCN.VISUAL_ID:

-			if (PropertyForSignalEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InterfaceAttributeCompartmentEditPartCN.VISUAL_ID:

-			if (PropertyForInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InterfaceOperationCompartmentEditPartCN.VISUAL_ID:

-			if (OperationForInterfaceEditpart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ReceptionInInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-			if (NestedClassForInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedInterfaceForInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedEnumerationForInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedDataTypeForInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedSignalForInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case PrimitiveTypeAttributeCompartmentEditPartCN.VISUAL_ID:

-			if (PropertyforPrimitiveTypeEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case PrimitiveTypeOperationCompartmentEditPartCN.VISUAL_ID:

-			if (OperationForPrimitiveTypeEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

-			if (PropertyforDataTypeEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:

-			if (OperationForDataTypeEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID:

-			if (InstanceSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ComponentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ModelEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PackageEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ClassEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID:

-			if (InstanceSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ComponentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ModelEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PackageEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ClassEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:

-			if (EnumerationLiteralEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID:

-			if (SlotEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ClassAttributeCompartmentEditPart.VISUAL_ID:

-			if (PropertyForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ClassOperationCompartmentEditPart.VISUAL_ID:

-			if (ReceptionEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (OperationForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ClassNestedClassifierCompartmentEditPart.VISUAL_ID:

-			if (NestedClassForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedInterfaceForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedEnumerationForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedPrimitiveTypeForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedDataTypeForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedSignalForClassEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ComponentAttributeCompartmentEditPart.VISUAL_ID:

-			if (PropertyForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ComponentOperationCompartmentEditPart.VISUAL_ID:

-			if (OperationForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ReceptionEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ComponentNestedClassifierCompartmentEditPart.VISUAL_ID:

-			if (NestedClassForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedInterfaceForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedEnumerationForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedPrimitiveTypeForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedDataTypeForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedSignalForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InterfaceAttributeCompartmentEditPart.VISUAL_ID:

-			if (PropertyForInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InterfaceOperationCompartmentEditPart.VISUAL_ID:

-			if (OperationForInterfaceEditpart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ReceptionInInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID:

-			if (NestedClassForInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedInterfaceForInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedEnumerationForInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedDataTypeForInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (NestedSignalForInterfaceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID:

-			if (PropertyforPrimitiveTypeEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID:

-			if (OperationForPrimitiveTypeEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

-			if (PropertyforDataTypeEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case DataTypeOperationCompartmentEditPart.VISUAL_ID:

-			if (OperationForDataTypeEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case AssociationClassAttributeCompartmentEditPart.VISUAL_ID:

-			if (PropertyForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID:

-			if (SlotEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case SignalAttributeCompartmentEditPart.VISUAL_ID:

-			if (PropertyForSignalEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ModelPackageableElementCompartmentEditPartTN.VISUAL_ID:

-			if (InstanceSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ComponentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ModelEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PackageEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ClassEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case PackagePackageableElementCompartmentEditPart.VISUAL_ID:

-			if (InstanceSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ComponentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ModelEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PackageEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ClassEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:

-			if (EnumerationLiteralEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case AssociationClassOperationCompartmentEditPart.VISUAL_ID:

-			if (OperationForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case AssociationClassNestedClassifierCompartmentEditPart.VISUAL_ID:

-			if (NestedClassForComponentEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID:

-			if (ClassifierTemplateParameterEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (ConnectableElementTemplateParameterEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (OperationTemplateParameterEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (TemplateParameterEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID:

-			if (ClassifierTemplateParameterEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (OperationTemplateParameterEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (TemplateParameterEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case AssociationClassLinkEditPart.VISUAL_ID:

-			if (AssociationClassRoleSourceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AssociationClassRoleTargetEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case AssociationEditPart.VISUAL_ID:

-			if (AppliedStereotypeAssociationEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AssociationNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AssociationTargetNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AssociationSourceNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AssociationMultiplicitySourceEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AssociationMultiplicityTargetEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case AssociationBranchEditPart.VISUAL_ID:

-			if (AssociationBranchRoleEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AssociationBranchMutliplicityEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case GeneralizationEditPart.VISUAL_ID:

-			if (AppliedStereotyperGeneralizationEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InterfaceRealizationEditPart.VISUAL_ID:

-			if (AppliedStereotypeInterfaceRealizationEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (InterfaceRealizationNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case SubstitutionEditPart.VISUAL_ID:

-			if (AppliedStereotypeSubstitutionEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (SubstitutionNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case RealizationEditPart.VISUAL_ID:

-			if (AppliedStereotypeRealizationEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (RealizationNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case AbstractionEditPart.VISUAL_ID:

-			if (AbstractionNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AppliedStereotypeAbstractionEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case UsageEditPart.VISUAL_ID:

-			if (UsageNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AppliedStereotypeUsageEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case DependencyEditPart.VISUAL_ID:

-			if (DependencyNameEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AppliedStereotypeDependencyEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case ElementImportEditPart.VISUAL_ID:

-			if (ElementImportAliasEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AppliedStereotypeElementImportEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case PackageImportEditPart.VISUAL_ID:

-			if (AppliedStereotypePackageImportEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case PackageMergeEditPart.VISUAL_ID:

-			if (AppliedStereotypePackageMergeEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case TemplateBindingEditPart.VISUAL_ID:

-			if (BindingSubstitutionEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AppliedStereotypeTemplateBindingEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case GeneralizationSetEditPart.VISUAL_ID:

-			if (ConstraintLabelEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (AppliedStereotypeGeneralizationSetLabelEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		case InstanceSpecificationLinkEditPart.VISUAL_ID:

-			if (SourceISLinkLabelEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			if (TargetISLinkLabelEditPart.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;

-		case ContextLinkEditPart.VISUAL_ID:

-			if (ContextLinkAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

-				return true;

-			}

-			break;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static int getLinkWithClassVisualID(EObject domainElement) {

-		if (domainElement == null) {

-			return -1;

-		}

-		if (UMLPackage.eINSTANCE.getAssociationClass().isSuperTypeOf(domainElement.eClass())) {

-			return AssociationClassLinkEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

-			return AssociationEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

-			return AssociationBranchEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(domainElement.eClass())) {

-			return GeneralizationEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(domainElement.eClass())) {

-			return InterfaceRealizationEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getSubstitution().isSuperTypeOf(domainElement.eClass())) {

-			return SubstitutionEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getRealization().isSuperTypeOf(domainElement.eClass())) {

-			return RealizationEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getAbstraction().isSuperTypeOf(domainElement.eClass())) {

-			return AbstractionEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getUsage().isSuperTypeOf(domainElement.eClass())) {

-			return UsageEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

-			return DependencyEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

-			return DependencyBranchEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getElementImport().isSuperTypeOf(domainElement.eClass())) {

-			return ElementImportEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getPackageImport().isSuperTypeOf(domainElement.eClass())) {

-			return PackageImportEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getPackageMerge().isSuperTypeOf(domainElement.eClass())) {

-			return PackageMergeEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getProfileApplication().isSuperTypeOf(domainElement.eClass())) {

-			return ProfileApplicationEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getTemplateBinding().isSuperTypeOf(domainElement.eClass())) {

-			return TemplateBindingEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getGeneralizationSet().isSuperTypeOf(domainElement.eClass())) {

-			return GeneralizationSetEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass())) {

-			return InstanceSpecificationLinkEditPart.VISUAL_ID;

-		}

-		if (UMLPackage.eINSTANCE.getInformationFlow().isSuperTypeOf(domainElement.eClass())) {

-			return InformationFlowEditPart.VISUAL_ID;

-		}

-		return -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

-	 */

-	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 ClassAttributeCompartmentEditPartCN.VISUAL_ID:

-		case ClassOperationCompartmentEditPartCN.VISUAL_ID:

-		case ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-		case ComponentAttributeCompartmentEditPartCN.VISUAL_ID:

-		case ComponentOperationCompartmentEditPartCN.VISUAL_ID:

-		case ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-		case SignalAttributeCompartmentEditPartCN.VISUAL_ID:

-		case InterfaceAttributeCompartmentEditPartCN.VISUAL_ID:

-		case InterfaceOperationCompartmentEditPartCN.VISUAL_ID:

-		case InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-		case PrimitiveTypeAttributeCompartmentEditPartCN.VISUAL_ID:

-		case PrimitiveTypeOperationCompartmentEditPartCN.VISUAL_ID:

-		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

-		case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:

-		case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID:

-		case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID:

-		case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:

-		case InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID:

-		case ClassAttributeCompartmentEditPart.VISUAL_ID:

-		case ClassOperationCompartmentEditPart.VISUAL_ID:

-		case ClassNestedClassifierCompartmentEditPart.VISUAL_ID:

-		case ComponentAttributeCompartmentEditPart.VISUAL_ID:

-		case ComponentOperationCompartmentEditPart.VISUAL_ID:

-		case ComponentNestedClassifierCompartmentEditPart.VISUAL_ID:

-		case InterfaceAttributeCompartmentEditPart.VISUAL_ID:

-		case InterfaceOperationCompartmentEditPart.VISUAL_ID:

-		case InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID:

-		case PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID:

-		case PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID:

-		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

-		case DataTypeOperationCompartmentEditPart.VISUAL_ID:

-		case AssociationClassAttributeCompartmentEditPart.VISUAL_ID:

-		case InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID:

-		case SignalAttributeCompartmentEditPart.VISUAL_ID:

-		case ModelPackageableElementCompartmentEditPartTN.VISUAL_ID:

-		case PackagePackageableElementCompartmentEditPart.VISUAL_ID:

-		case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:

-		case AssociationClassOperationCompartmentEditPart.VISUAL_ID:

-		case AssociationClassNestedClassifierCompartmentEditPart.VISUAL_ID:

-		case RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID:

-		case TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID:

-			return true;

-		default:

-			break;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static boolean isSemanticLeafVisualID(int visualID) {

-		switch (visualID) {

-		case ModelEditPart.VISUAL_ID:

-			return false;

-		case ConstraintEditPart.VISUAL_ID:

-		case CommentEditPart.VISUAL_ID:

-		case DependencyNodeEditPart.VISUAL_ID:

-		case AssociationNodeEditPart.VISUAL_ID:

-		case ShortCutDiagramEditPart.VISUAL_ID:

-		case DurationObservationEditPart.VISUAL_ID:

-		case TimeObservationEditPart.VISUAL_ID:

-		case DefaultNamedElementEditPart.VISUAL_ID:

-		case InformationItemEditPart.VISUAL_ID:

-		case PropertyForComponentEditPart.VISUAL_ID:

-		case OperationForComponentEditPart.VISUAL_ID:

-		case NestedClassForComponentEditPart.VISUAL_ID:

-		case PropertyForSignalEditPart.VISUAL_ID:

-		case PropertyForInterfaceEditPart.VISUAL_ID:

-		case OperationForInterfaceEditpart.VISUAL_ID:

-		case NestedClassForInterfaceEditPart.VISUAL_ID:

-		case ReceptionEditPart.VISUAL_ID:

-		case PropertyForClassEditPart.VISUAL_ID:

-		case OperationForClassEditPart.VISUAL_ID:

-		case NestedClassForClassEditPart.VISUAL_ID:

-		case TemplateParameterEditPart.VISUAL_ID:

-		case EnumerationLiteralEditPart.VISUAL_ID:

-		case PropertyforDataTypeEditPart.VISUAL_ID:

-		case OperationForDataTypeEditPart.VISUAL_ID:

-		case CommentEditPartCN.VISUAL_ID:

-		case ConstraintEditPartCN.VISUAL_ID:

-		case SlotEditPart.VISUAL_ID:

-		case ClassifierTemplateParameterEditPart.VISUAL_ID:

-		case ContainmentCircleEditPart.VISUAL_ID:

-		case ConnectableElementTemplateParameterEditPart.VISUAL_ID:

-		case OperationTemplateParameterEditPart.VISUAL_ID:

-		case NestedInterfaceForClassEditPart.VISUAL_ID:

-		case NestedInterfaceForComponentEditPart.VISUAL_ID:

-		case NestedInterfaceForInterfaceEditPart.VISUAL_ID:

-		case ReceptionInInterfaceEditPart.VISUAL_ID:

-		case InformationItemEditPartCN.VISUAL_ID:

-		case PropertyforPrimitiveTypeEditPart.VISUAL_ID:

-		case OperationForPrimitiveTypeEditPart.VISUAL_ID:

-		case NestedDataTypeForInterfaceEditPart.VISUAL_ID:

-		case NestedDataTypeForClassEditPart.VISUAL_ID:

-		case NestedDataTypeForComponentEditPart.VISUAL_ID:

-		case NestedPrimitiveTypeForComponentEditPart.VISUAL_ID:

-		case NestedPrimitiveTypeForClassEditPart.VISUAL_ID:

-		case NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID:

-		case NestedSignalForInterfaceEditPart.VISUAL_ID:

-		case NestedSignalForClassEditPart.VISUAL_ID:

-		case NestedSignalForComponentEditPart.VISUAL_ID:

-		case NestedEnumerationForClassEditPart.VISUAL_ID:

-		case NestedEnumerationForComponentEditPart.VISUAL_ID:

-		case NestedEnumerationForInterfaceEditPart.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.clazz.part.UMLVisualIDRegistry.getVisualID(view);

-		}

-

-		/**

-		 * @generated

-		 */

-		@Override

-		public String getModelID(View view) {

-			return org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getModelID(view);

-		}

-

-		/**

-		 * @generated

-		 */

-		@Override

-		public int getNodeVisualID(View containerView, EObject domainElement) {

-			return org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement);

-		}

-

-		/**

-		 * @generated

-		 */

-		@Override

-		public boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate) {

-			return org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.checkNodeVisualID(containerView, domainElement, candidate);

-		}

-

-		/**

-		 * @generated

-		 */

-		@Override

-		public boolean isCompartmentVisualID(int visualID) {

-			return org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.isCompartmentVisualID(visualID);

-		}

-

-		/**

-		 * @generated

-		 */

-		@Override

-		public boolean isSemanticLeafVisualID(int visualID) {

-			return org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.isSemanticLeafVisualID(visualID);

-		}

-	};

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/ValidateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/ValidateAction.java
deleted file mode 100644
index 2dac8575f58..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/ValidateAction.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.providers.UMLMarkerNavigationProvider;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLValidationProvider;

-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) {

-		DiagramEditPart diagramEditPart =

-				OffscreenEditPartFactory.getInstance().createDiagramEditPart(

-						view.getDiagram());

-		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 allDiagnostics = new ArrayList();

-		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap =

-				new UMLDiagramEditorUtil.LazyElement2ViewMap(

-						diagramEditPart.getDiagramView(),

-						collectTargetElements(rootStatus, new HashSet<EObject>(), allDiagnostics));

-		for (Iterator 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 allConstraintStatuses) {

-		if (status instanceof IConstraintStatus) {

-			targetElementCollector.add(((IConstraintStatus) status).getTarget());

-			allConstraintStatuses.add(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 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 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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramAppearancePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramAppearancePreferencePage.java
deleted file mode 100644
index 20b164fa498..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramAppearancePreferencePage.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.preferences;

-

-import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;

-import org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramConnectionsPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramConnectionsPreferencePage.java
deleted file mode 100644
index 35766d40487..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramConnectionsPreferencePage.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.preferences;

-

-import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;

-import org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramGeneralPreferencePage.java
deleted file mode 100644
index 4dbe209f615..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramGeneralPreferencePage.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.preferences;

-

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-

-/**

- * @generated

- */

-public class DiagramGeneralPreferencePage extends DiagramPreferencePage

-{

-

-	/**

-	 * @generated

-	 */

-	public DiagramGeneralPreferencePage() {

-		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());

-		setPreferenceKey(ModelEditPart.MODEL_ID);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPreferenceInitializer.java
deleted file mode 100644
index 0a45ad79ffd..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPreferenceInitializer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.preferences;

-

-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPrintingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPrintingPreferencePage.java
deleted file mode 100644
index 9b5e4251f49..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPrintingPreferencePage.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.preferences;

-

-import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;

-import org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramRulersAndGridPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramRulersAndGridPreferencePage.java
deleted file mode 100644
index 15c7f66771b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramRulersAndGridPreferencePage.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.preferences;

-

-import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;

-import org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/ElementInitializers.java
deleted file mode 100644
index c815f5454ad..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/ElementInitializers.java
+++ /dev/null
@@ -1,1627 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.providers;

-

-import org.eclipse.papyrus.uml.diagram.clazz.expressions.UMLOCLFactory;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;

-import org.eclipse.uml2.uml.Abstraction;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.AssociationClass;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.Component;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.DurationObservation;

-import org.eclipse.uml2.uml.ElementImport;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-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.LiteralString;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Operation;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.PrimitiveType;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Realization;

-import org.eclipse.uml2.uml.Reception;

-import org.eclipse.uml2.uml.RedefinableTemplateSignature;

-import org.eclipse.uml2.uml.Signal;

-import org.eclipse.uml2.uml.Substitution;

-import org.eclipse.uml2.uml.TimeObservation;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.Usage;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-/**

- * @generated

- */

-public class ElementInitializers {

-

-	protected ElementInitializers() {

-		// use #getInstance to access cached instance

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_AssociationClass_2013(AssociationClass instance) {

-		try {

-			Object value_0 = name_AssociationClass_2013(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_InstanceSpecification_2001(InstanceSpecification instance) {

-		try {

-			Object value_0 = name_InstanceSpecification_2001(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Component_2002(Component instance) {

-		try {

-			Object value_0 = name_Component_2002(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Signal_2003(Signal instance) {

-		try {

-			Object value_0 = name_Signal_2003(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Interface_2004(Interface instance) {

-		try {

-			Object value_0 = name_Interface_2004(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Model_2005(Model instance) {

-		try {

-			Object value_0 = name_Model_2005(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Enumeration_2006(Enumeration instance) {

-		try {

-			Object value_0 = name_Enumeration_2006(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Package_2007(Package instance) {

-		try {

-			Object value_0 = name_Package_2007(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_InformationItem_2099(InformationItem instance) {

-		try {

-			Object value_0 = name_InformationItem_2099(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Class_2008(Class instance) {

-		try {

-			Object value_0 = name_Class_2008(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_PrimitiveType_2009(PrimitiveType instance) {

-		try {

-			Object value_0 = name_PrimitiveType_2009(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_DataType_2010(DataType instance) {

-		try {

-			Object value_0 = name_DataType_2010(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Constraint_2011(Constraint instance) {

-		try {

-			Object value_0 = name_Constraint_2011(instance);

-			instance.setName(

-					(String) value_0

-					);

-			Object value_1 = specification_Constraint_2011(instance);

-			instance.setSpecification(

-					(ValueSpecification) value_1

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Comment_2012(Comment instance) {

-		try {

-			Object value_0 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getComment(), null).evaluate(instance);

-			instance.setBody(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_DurationObservation_2095(DurationObservation instance) {

-		try {

-			Object value_0 = name_DurationObservation_2095(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_TimeObservation_2096(TimeObservation instance) {

-		try {

-			Object value_0 = name_TimeObservation_2096(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Property_3012(Property instance) {

-		try {

-			Object value_0 = name_Property_3012(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Property_3002(Property instance) {

-		try {

-			Object value_0 = name_Property_3002(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Property_3005(Property instance) {

-		try {

-			Object value_0 = name_Property_3005(instance);

-			instance.setName(

-					(String) value_0

-					);

-			instance.setLower(

-					0

-					);

-

-			instance.setUpper(

-					1

-					);

-

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Property_3006(Property instance) {

-		try {

-			Object value_0 = name_Property_3006(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Property_3041(Property instance) {

-		try {

-			Object value_0 = name_Property_3041(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Property_3018(Property instance) {

-		try {

-			Object value_0 = name_Property_3018(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Class_3014(Class instance) {

-		try {

-			Object value_0 = name_Class_3014(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Class_3004(Class instance) {

-		try {

-			Object value_0 = name_Class_3004(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Class_3008(Class instance) {

-		try {

-			Object value_0 = name_Class_3008(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Operation_3013(Operation instance) {

-		try {

-			Object value_0 = name_Operation_3013(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Operation_3003(Operation instance) {

-		try {

-			Object value_0 = name_Operation_3003(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Operation_3007(Operation instance) {

-		try {

-			Object value_0 = name_Operation_3007(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Operation_3042(Operation instance) {

-		try {

-			Object value_0 = name_Operation_3042(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Operation_3019(Operation instance) {

-		try {

-			Object value_0 = name_Operation_3019(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_EnumerationLiteral_3017(EnumerationLiteral instance) {

-		try {

-			Object value_0 = name_EnumerationLiteral_3017(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Reception_3011(Reception instance) {

-		try {

-			Object value_0 = name_Reception_3011(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Reception_3039(Reception instance) {

-		try {

-			Object value_0 = name_Reception_3039(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_RedefinableTemplateSignature_3015(RedefinableTemplateSignature instance) {

-		try {

-			Object value_0 = name_RedefinableTemplateSignature_3015(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_InstanceSpecification_3020(InstanceSpecification instance) {

-		try {

-			Object value_0 = name_InstanceSpecification_3020(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Component_3021(Component instance) {

-		try {

-			Object value_0 = name_Component_3021(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Signal_3022(Signal instance) {

-		try {

-			Object value_0 = name_Signal_3022(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Interface_3023(Interface instance) {

-		try {

-			Object value_0 = name_Interface_3023(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Model_3024(Model instance) {

-		try {

-			Object value_0 = name_Model_3024(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Enumeration_3025(Enumeration instance) {

-		try {

-			Object value_0 = name_Enumeration_3025(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Package_3009(Package instance) {

-		try {

-			Object value_0 = name_Package_3009(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_InformationItem_3040(InformationItem instance) {

-		try {

-			Object value_0 = name_InformationItem_3040(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Class_3010(Class instance) {

-		try {

-			Object value_0 = name_Class_3010(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_PrimitiveType_3026(PrimitiveType instance) {

-		try {

-			Object value_0 = name_PrimitiveType_3026(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_DataType_3027(DataType instance) {

-		try {

-			Object value_0 = name_DataType_3027(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Comment_3028(Comment instance) {

-		try {

-			Object value_0 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getComment(), null).evaluate(instance);

-			instance.setBody(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Constraint_3029(Constraint instance) {

-		try {

-			Object value_0 = name_Constraint_3029(instance);

-			instance.setName(

-					(String) value_0

-					);

-			Object value_1 = specification_Constraint_3029(instance);

-			instance.setSpecification(

-					(ValueSpecification) value_1

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Interface_3036(Interface instance) {

-		try {

-			Object value_0 = name_Interface_3036(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Interface_3037(Interface instance) {

-		try {

-			Object value_0 = name_Interface_3037(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Interface_3038(Interface instance) {

-		try {

-			Object value_0 = name_Interface_3038(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Enumeration_3052(Enumeration instance) {

-		try {

-			Object value_0 = name_Enumeration_3052(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Enumeration_3053(Enumeration instance) {

-		try {

-			Object value_0 = name_Enumeration_3053(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Enumeration_3054(Enumeration instance) {

-		try {

-			Object value_0 = name_Enumeration_3054(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_PrimitiveType_3047(PrimitiveType instance) {

-		try {

-			Object value_0 = name_PrimitiveType_3047(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_PrimitiveType_3046(PrimitiveType instance) {

-		try {

-			Object value_0 = name_PrimitiveType_3046(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_PrimitiveType_3048(PrimitiveType instance) {

-		try {

-			Object value_0 = name_PrimitiveType_3048(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_DataType_3044(DataType instance) {

-		try {

-			Object value_0 = name_DataType_3044(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_DataType_3045(DataType instance) {

-		try {

-			Object value_0 = name_DataType_3045(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_DataType_3043(DataType instance) {

-		try {

-			Object value_0 = name_DataType_3043(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Signal_3050(Signal instance) {

-		try {

-			Object value_0 = name_Signal_3050(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Signal_3051(Signal instance) {

-		try {

-			Object value_0 = name_Signal_3051(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Signal_3049(Signal instance) {

-		try {

-			Object value_0 = name_Signal_3049(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_AssociationClass_4017(AssociationClass instance) {

-		try {

-			Object value_0 = name_AssociationClass_4017(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Association_4001(Association instance) {

-		try {

-			Object value_0 = name_Association_4001(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_InterfaceRealization_4003(InterfaceRealization instance) {

-		try {

-			Object value_0 = name_InterfaceRealization_4003(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Substitution_4004(Substitution instance) {

-		try {

-			Object value_0 = name_Substitution_4004(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Realization_4005(Realization instance) {

-		try {

-			Object value_0 = name_Realization_4005(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Abstraction_4006(Abstraction instance) {

-		try {

-			Object value_0 = name_Abstraction_4006(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Usage_4007(Usage instance) {

-		try {

-			Object value_0 = name_Usage_4007(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Dependency_4008(Dependency instance) {

-		try {

-			Object value_0 = name_Dependency_4008(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_Dependency_4018(Dependency instance) {

-		try {

-			Object value_0 = name_Dependency_4018(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_ElementImport_4009(ElementImport instance) {

-		try {

-			Object value_0 = alias_ElementImport_4009(instance);

-			instance.setAlias(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void init_InformationFlow_4026(InformationFlow instance) {

-		try {

-			Object value_0 = name_InformationFlow_4026(instance);

-			instance.setName(

-					(String) value_0

-					);

-		} catch (RuntimeException e) {

-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_AssociationClass_2013(AssociationClass it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_InstanceSpecification_2001(InstanceSpecification it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Component_2002(Component it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Signal_2003(Signal it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Interface_2004(Interface it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Model_2005(Model it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Enumeration_2006(Enumeration it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Package_2007(Package it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_InformationItem_2099(InformationItem it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Class_2008(Class it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_PrimitiveType_2009(PrimitiveType it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_DataType_2010(DataType it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Constraint_2011(Constraint it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private ValueSpecification specification_Constraint_2011(Constraint it) {

-		LiteralString literalString = UMLFactory.eINSTANCE.createLiteralString();

-		literalString.setValue("");

-		return literalString;

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_DurationObservation_2095(DurationObservation it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_TimeObservation_2096(TimeObservation it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Property_3012(Property it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Property_3002(Property it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Property_3005(Property it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Property_3006(Property it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Property_3041(Property it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Property_3018(Property it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Class_3014(Class it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Class_3004(Class it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Class_3008(Class it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Operation_3013(Operation it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Operation_3003(Operation it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Operation_3007(Operation it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Operation_3042(Operation it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Operation_3019(Operation it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_EnumerationLiteral_3017(EnumerationLiteral it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Reception_3011(Reception it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Reception_3039(Reception it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_RedefinableTemplateSignature_3015(RedefinableTemplateSignature it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_InstanceSpecification_3020(InstanceSpecification it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Component_3021(Component it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Signal_3022(Signal it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Interface_3023(Interface it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Model_3024(Model it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Enumeration_3025(Enumeration it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Package_3009(Package it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_InformationItem_3040(InformationItem it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Class_3010(Class it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_PrimitiveType_3026(PrimitiveType it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_DataType_3027(DataType it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Constraint_3029(Constraint it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private ValueSpecification specification_Constraint_3029(Constraint it) {

-		LiteralString literalString = UMLFactory.eINSTANCE.createLiteralString();

-		literalString.setValue("");

-		return literalString;

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Interface_3036(Interface it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Interface_3037(Interface it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Interface_3038(Interface it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Enumeration_3052(Enumeration it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Enumeration_3053(Enumeration it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Enumeration_3054(Enumeration it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_PrimitiveType_3047(PrimitiveType it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_PrimitiveType_3046(PrimitiveType it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_PrimitiveType_3048(PrimitiveType it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_DataType_3044(DataType it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_DataType_3045(DataType it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_DataType_3043(DataType it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Signal_3050(Signal it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Signal_3051(Signal it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Signal_3049(Signal it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_AssociationClass_4017(AssociationClass it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Association_4001(Association it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_InterfaceRealization_4003(InterfaceRealization it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Substitution_4004(Substitution it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Realization_4005(Realization it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Abstraction_4006(Abstraction it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Usage_4007(Usage it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Dependency_4008(Dependency it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_Dependency_4018(Dependency it) {

-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

-	}

-

-	/**

-	 * @generated

-	 */

-	private String alias_ElementImport_4009(ElementImport it) {

-		if (it.getImportedElement() != null) {

-			return (it.getImportedElement().getLabel());

-		}

-		return "elementimport";

-	}

-

-	/**

-	 * @generated

-	 */

-	private String name_InformationFlow_4026(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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLEditPartProvider.java
deleted file mode 100644
index 5b9bd38f416..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLEditPartProvider.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.providers;

-

-import org.eclipse.gmf.tooling.runtime.providers.DefaultEditPartProvider;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UMLEditPartFactory;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-

-/**

- * @generated

- */

-public class UMLEditPartProvider extends DefaultEditPartProvider {

-

-	/**

-	 * @generated

-	 */

-	public UMLEditPartProvider() {

-		super(new UMLEditPartFactory(),

-				UMLVisualIDRegistry.TYPED_INSTANCE,

-				ModelEditPart.MODEL_ID);

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLElementTypes.java
deleted file mode 100644
index 97374c4808b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLElementTypes.java
+++ /dev/null
@@ -1,1057 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.runtime.notation.NotationPackage;

-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.clazz.edit.parts.*;

-import org.eclipse.papyrus.uml.diagram.clazz.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.clazz.Package_1000"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Dependency_2014 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType AssociationClass_2013 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_2013"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Association_2015 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Association_2015"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType InstanceSpecification_2001 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_2001"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Component_2002 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Component_2002"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Signal_2003 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Interface_2004 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Interface_2004"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Model_2005 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Model_2005"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Enumeration_2006 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Enumeration_2006"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Package_2007 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_2007"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType InformationItem_2099 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.InformationItem_2099"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Class_2008 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_2008"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType PrimitiveType_2009 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_2009"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType DataType_2010 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.DataType_2010"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Constraint_2011 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Comment_2012 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Diagram_2016 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Diagram_2016"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType DurationObservation_2095 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.DurationObservation_2095"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType TimeObservation_2096 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.TimeObservation_2096"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType NamedElement_2097 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.NamedElement_2097"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Property_3012 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3012"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Property_3002 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3002"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Property_3005 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3005"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Property_3006 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3006"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Property_3041 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3041"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Property_3018 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3018"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Class_3014 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_3014"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Class_3004 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_3004"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Class_3008 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_3008"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Operation_3013 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Operation_3013"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Operation_3003 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Operation_3003"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Operation_3007 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Operation_3007"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Operation_3042 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Operation_3042"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Operation_3019 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Operation_3019"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType ConnectableElementTemplateParameter_3034 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.ConnectableElementTemplateParameter_3034"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType OperationTemplateParameter_3035 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.OperationTemplateParameter_3035"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType ClassifierTemplateParameter_3031 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.ClassifierTemplateParameter_3031"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType TemplateParameter_3016 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.TemplateParameter_3016"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType EnumerationLiteral_3017 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.EnumerationLiteral_3017"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Reception_3011 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Reception_3011"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Reception_3039 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Reception_3039"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Slot_3030 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Slot_3030"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType RedefinableTemplateSignature_3015 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.RedefinableTemplateSignature_3015"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Node_3032 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.ContainmentCircle_3032"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType TemplateSignature_3033 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.TemplateSignature_3033"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType InstanceSpecification_3020 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_3020"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Component_3021 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Component_3021"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Signal_3022 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Signal_3022"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Interface_3023 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Interface_3023"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Model_3024 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Model_3024"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Enumeration_3025 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Package_3009 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_3009"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType InformationItem_3040 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.InformationItem_3040"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Class_3010 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_3010"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType PrimitiveType_3026 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType DataType_3027 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.DataType_3027"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Comment_3028 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Constraint_3029 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Interface_3036 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Interface_3036"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Interface_3037 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Interface_3037"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Interface_3038 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Interface_3038"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Enumeration_3052 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3052"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Enumeration_3053 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3053"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Enumeration_3054 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3054"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType PrimitiveType_3047 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3047"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType PrimitiveType_3046 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3046"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType PrimitiveType_3048 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3048"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType DataType_3044 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.DataType_3044"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType DataType_3045 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.DataType_3045"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType DataType_3043 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.DataType_3043"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Signal_3050 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Signal_3050"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Signal_3051 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Signal_3051"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Signal_3049 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Signal_3049"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Link_4016 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Link_4016"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType AssociationClass_4017 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_4017"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Association_4001 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Association_4001"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Association_4019 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Association_4019"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Generalization_4002 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Generalization_4002"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType InterfaceRealization_4003 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.InterfaceRealization_4003"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Substitution_4004 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Substitution_4004"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Realization_4005 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Realization_4005"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Abstraction_4006 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Abstraction_4006"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Usage_4007 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Usage_4007"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Dependency_4008 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Dependency_4018 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType ElementImport_4009 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.ElementImport_4009"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType PackageImport_4010 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType PackageMerge_4011 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.PackageMerge_4011"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType ProfileApplication_4012 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.ProfileApplication_4012"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType CommentAnnotatedElement_4013 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType ConstraintConstrainedElement_4014 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType TemplateBinding_4015 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.TemplateBinding_4015"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType GeneralizationSet_4020 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.GeneralizationSet_4020"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType InstanceSpecification_4021 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecificationLink_4021"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Link_4022 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.AddedLink_4022"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType Link_4023 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType TimeObservationEvent_4024 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.TimeObservationEvent_4024"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType DurationObservationEvent_4025 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.DurationObservationEvent_4025"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType InformationFlow_4026 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.InformationFlow_4026"); //$NON-NLS-1$

-	/**

-	 * @generated

-	 */

-	public static final IElementType ConstraintContext_8500 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.ConstraintContext_8500"); //$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(Dependency_2014, UMLPackage.eINSTANCE.getDependency());

-

-			elements.put(AssociationClass_2013, UMLPackage.eINSTANCE.getAssociationClass());

-

-			elements.put(Association_2015, UMLPackage.eINSTANCE.getAssociation());

-

-			elements.put(InstanceSpecification_2001, UMLPackage.eINSTANCE.getInstanceSpecification());

-

-			elements.put(Component_2002, UMLPackage.eINSTANCE.getComponent());

-

-			elements.put(Signal_2003, UMLPackage.eINSTANCE.getSignal());

-

-			elements.put(Interface_2004, UMLPackage.eINSTANCE.getInterface());

-

-			elements.put(Model_2005, UMLPackage.eINSTANCE.getModel());

-

-			elements.put(Enumeration_2006, UMLPackage.eINSTANCE.getEnumeration());

-

-			elements.put(Package_2007, UMLPackage.eINSTANCE.getPackage());

-

-			elements.put(InformationItem_2099, UMLPackage.eINSTANCE.getInformationItem());

-

-			elements.put(Class_2008, UMLPackage.eINSTANCE.getClass_());

-

-			elements.put(PrimitiveType_2009, UMLPackage.eINSTANCE.getPrimitiveType());

-

-			elements.put(DataType_2010, UMLPackage.eINSTANCE.getDataType());

-

-			elements.put(Constraint_2011, UMLPackage.eINSTANCE.getConstraint());

-

-			elements.put(Comment_2012, UMLPackage.eINSTANCE.getComment());

-

-			elements.put(Diagram_2016, NotationPackage.eINSTANCE.getDiagram());

-

-			elements.put(DurationObservation_2095, UMLPackage.eINSTANCE.getDurationObservation());

-

-			elements.put(TimeObservation_2096, UMLPackage.eINSTANCE.getTimeObservation());

-

-			elements.put(NamedElement_2097, UMLPackage.eINSTANCE.getNamedElement());

-

-			elements.put(Property_3012, UMLPackage.eINSTANCE.getProperty());

-

-			elements.put(Property_3002, UMLPackage.eINSTANCE.getProperty());

-

-			elements.put(Property_3005, UMLPackage.eINSTANCE.getProperty());

-

-			elements.put(Property_3006, UMLPackage.eINSTANCE.getProperty());

-

-			elements.put(Property_3041, UMLPackage.eINSTANCE.getProperty());

-

-			elements.put(Property_3018, UMLPackage.eINSTANCE.getProperty());

-

-			elements.put(Class_3014, UMLPackage.eINSTANCE.getClass_());

-

-			elements.put(Class_3004, UMLPackage.eINSTANCE.getClass_());

-

-			elements.put(Class_3008, UMLPackage.eINSTANCE.getClass_());

-

-			elements.put(Operation_3013, UMLPackage.eINSTANCE.getOperation());

-

-			elements.put(Operation_3003, UMLPackage.eINSTANCE.getOperation());

-

-			elements.put(Operation_3007, UMLPackage.eINSTANCE.getOperation());

-

-			elements.put(Operation_3042, UMLPackage.eINSTANCE.getOperation());

-

-			elements.put(Operation_3019, UMLPackage.eINSTANCE.getOperation());

-

-			elements.put(ConnectableElementTemplateParameter_3034, UMLPackage.eINSTANCE.getConnectableElementTemplateParameter());

-

-			elements.put(OperationTemplateParameter_3035, UMLPackage.eINSTANCE.getOperationTemplateParameter());

-

-			elements.put(ClassifierTemplateParameter_3031, UMLPackage.eINSTANCE.getClassifierTemplateParameter());

-

-			elements.put(TemplateParameter_3016, UMLPackage.eINSTANCE.getTemplateParameter());

-

-			elements.put(EnumerationLiteral_3017, UMLPackage.eINSTANCE.getEnumerationLiteral());

-

-			elements.put(Reception_3011, UMLPackage.eINSTANCE.getReception());

-

-			elements.put(Reception_3039, UMLPackage.eINSTANCE.getReception());

-

-			elements.put(Slot_3030, UMLPackage.eINSTANCE.getSlot());

-

-			elements.put(RedefinableTemplateSignature_3015, UMLPackage.eINSTANCE.getRedefinableTemplateSignature());

-

-			elements.put(TemplateSignature_3033, UMLPackage.eINSTANCE.getTemplateSignature());

-

-			elements.put(InstanceSpecification_3020, UMLPackage.eINSTANCE.getInstanceSpecification());

-

-			elements.put(Component_3021, UMLPackage.eINSTANCE.getComponent());

-

-			elements.put(Signal_3022, UMLPackage.eINSTANCE.getSignal());

-

-			elements.put(Interface_3023, UMLPackage.eINSTANCE.getInterface());

-

-			elements.put(Model_3024, UMLPackage.eINSTANCE.getModel());

-

-			elements.put(Enumeration_3025, UMLPackage.eINSTANCE.getEnumeration());

-

-			elements.put(Package_3009, UMLPackage.eINSTANCE.getPackage());

-

-			elements.put(InformationItem_3040, UMLPackage.eINSTANCE.getInformationItem());

-

-			elements.put(Class_3010, UMLPackage.eINSTANCE.getClass_());

-

-			elements.put(PrimitiveType_3026, UMLPackage.eINSTANCE.getPrimitiveType());

-

-			elements.put(DataType_3027, UMLPackage.eINSTANCE.getDataType());

-

-			elements.put(Comment_3028, UMLPackage.eINSTANCE.getComment());

-

-			elements.put(Constraint_3029, UMLPackage.eINSTANCE.getConstraint());

-

-			elements.put(Interface_3036, UMLPackage.eINSTANCE.getInterface());

-

-			elements.put(Interface_3037, UMLPackage.eINSTANCE.getInterface());

-

-			elements.put(Interface_3038, UMLPackage.eINSTANCE.getInterface());

-

-			elements.put(Enumeration_3052, UMLPackage.eINSTANCE.getEnumeration());

-

-			elements.put(Enumeration_3053, UMLPackage.eINSTANCE.getEnumeration());

-

-			elements.put(Enumeration_3054, UMLPackage.eINSTANCE.getEnumeration());

-

-			elements.put(PrimitiveType_3047, UMLPackage.eINSTANCE.getPrimitiveType());

-

-			elements.put(PrimitiveType_3046, UMLPackage.eINSTANCE.getPrimitiveType());

-

-			elements.put(PrimitiveType_3048, UMLPackage.eINSTANCE.getPrimitiveType());

-

-			elements.put(DataType_3044, UMLPackage.eINSTANCE.getDataType());

-

-			elements.put(DataType_3045, UMLPackage.eINSTANCE.getDataType());

-

-			elements.put(DataType_3043, UMLPackage.eINSTANCE.getDataType());

-

-			elements.put(Signal_3050, UMLPackage.eINSTANCE.getSignal());

-

-			elements.put(Signal_3051, UMLPackage.eINSTANCE.getSignal());

-

-			elements.put(Signal_3049, UMLPackage.eINSTANCE.getSignal());

-

-			elements.put(AssociationClass_4017, UMLPackage.eINSTANCE.getAssociationClass());

-

-			elements.put(Association_4001, UMLPackage.eINSTANCE.getAssociation());

-

-			elements.put(Association_4019, UMLPackage.eINSTANCE.getAssociation());

-

-			elements.put(Generalization_4002, UMLPackage.eINSTANCE.getGeneralization());

-

-			elements.put(InterfaceRealization_4003, UMLPackage.eINSTANCE.getInterfaceRealization());

-

-			elements.put(Substitution_4004, UMLPackage.eINSTANCE.getSubstitution());

-

-			elements.put(Realization_4005, UMLPackage.eINSTANCE.getRealization());

-

-			elements.put(Abstraction_4006, UMLPackage.eINSTANCE.getAbstraction());

-

-			elements.put(Usage_4007, UMLPackage.eINSTANCE.getUsage());

-

-			elements.put(Dependency_4008, UMLPackage.eINSTANCE.getDependency());

-

-			elements.put(Dependency_4018, UMLPackage.eINSTANCE.getDependency());

-

-			elements.put(ElementImport_4009, UMLPackage.eINSTANCE.getElementImport());

-

-			elements.put(PackageImport_4010, UMLPackage.eINSTANCE.getPackageImport());

-

-			elements.put(PackageMerge_4011, UMLPackage.eINSTANCE.getPackageMerge());

-

-			elements.put(ProfileApplication_4012, UMLPackage.eINSTANCE.getProfileApplication());

-

-			elements.put(CommentAnnotatedElement_4013, UMLPackage.eINSTANCE.getComment_AnnotatedElement());

-

-			elements.put(ConstraintConstrainedElement_4014, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement());

-

-			elements.put(TemplateBinding_4015, UMLPackage.eINSTANCE.getTemplateBinding());

-

-			elements.put(GeneralizationSet_4020, UMLPackage.eINSTANCE.getGeneralizationSet());

-

-			elements.put(InstanceSpecification_4021, UMLPackage.eINSTANCE.getInstanceSpecification());

-

-			elements.put(TimeObservationEvent_4024, UMLPackage.eINSTANCE.getTimeObservation_Event());

-

-			elements.put(DurationObservationEvent_4025, UMLPackage.eINSTANCE.getDurationObservation_Event());

-

-			elements.put(InformationFlow_4026, UMLPackage.eINSTANCE.getInformationFlow());

-

-			elements.put(ConstraintContext_8500, UMLPackage.eINSTANCE.getConstraint_Context());

-		}

-		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(Dependency_2014);

-			KNOWN_ELEMENT_TYPES.add(AssociationClass_2013);

-			KNOWN_ELEMENT_TYPES.add(Association_2015);

-			KNOWN_ELEMENT_TYPES.add(InstanceSpecification_2001);

-			KNOWN_ELEMENT_TYPES.add(Component_2002);

-			KNOWN_ELEMENT_TYPES.add(Signal_2003);

-			KNOWN_ELEMENT_TYPES.add(Interface_2004);

-			KNOWN_ELEMENT_TYPES.add(Model_2005);

-			KNOWN_ELEMENT_TYPES.add(Enumeration_2006);

-			KNOWN_ELEMENT_TYPES.add(Package_2007);

-			KNOWN_ELEMENT_TYPES.add(InformationItem_2099);

-			KNOWN_ELEMENT_TYPES.add(Class_2008);

-			KNOWN_ELEMENT_TYPES.add(PrimitiveType_2009);

-			KNOWN_ELEMENT_TYPES.add(DataType_2010);

-			KNOWN_ELEMENT_TYPES.add(Constraint_2011);

-			KNOWN_ELEMENT_TYPES.add(Comment_2012);

-			KNOWN_ELEMENT_TYPES.add(Diagram_2016);

-			KNOWN_ELEMENT_TYPES.add(DurationObservation_2095);

-			KNOWN_ELEMENT_TYPES.add(TimeObservation_2096);

-			KNOWN_ELEMENT_TYPES.add(NamedElement_2097);

-			KNOWN_ELEMENT_TYPES.add(Property_3012);

-			KNOWN_ELEMENT_TYPES.add(Property_3002);

-			KNOWN_ELEMENT_TYPES.add(Property_3005);

-			KNOWN_ELEMENT_TYPES.add(Property_3006);

-			KNOWN_ELEMENT_TYPES.add(Property_3041);

-			KNOWN_ELEMENT_TYPES.add(Property_3018);

-			KNOWN_ELEMENT_TYPES.add(Class_3014);

-			KNOWN_ELEMENT_TYPES.add(Class_3004);

-			KNOWN_ELEMENT_TYPES.add(Class_3008);

-			KNOWN_ELEMENT_TYPES.add(Operation_3013);

-			KNOWN_ELEMENT_TYPES.add(Operation_3003);

-			KNOWN_ELEMENT_TYPES.add(Operation_3007);

-			KNOWN_ELEMENT_TYPES.add(Operation_3042);

-			KNOWN_ELEMENT_TYPES.add(Operation_3019);

-			KNOWN_ELEMENT_TYPES.add(ConnectableElementTemplateParameter_3034);

-			KNOWN_ELEMENT_TYPES.add(OperationTemplateParameter_3035);

-			KNOWN_ELEMENT_TYPES.add(ClassifierTemplateParameter_3031);

-			KNOWN_ELEMENT_TYPES.add(TemplateParameter_3016);

-			KNOWN_ELEMENT_TYPES.add(EnumerationLiteral_3017);

-			KNOWN_ELEMENT_TYPES.add(Reception_3011);

-			KNOWN_ELEMENT_TYPES.add(Reception_3039);

-			KNOWN_ELEMENT_TYPES.add(Slot_3030);

-			KNOWN_ELEMENT_TYPES.add(RedefinableTemplateSignature_3015);

-			KNOWN_ELEMENT_TYPES.add(Node_3032);

-			KNOWN_ELEMENT_TYPES.add(TemplateSignature_3033);

-			KNOWN_ELEMENT_TYPES.add(InstanceSpecification_3020);

-			KNOWN_ELEMENT_TYPES.add(Component_3021);

-			KNOWN_ELEMENT_TYPES.add(Signal_3022);

-			KNOWN_ELEMENT_TYPES.add(Interface_3023);

-			KNOWN_ELEMENT_TYPES.add(Model_3024);

-			KNOWN_ELEMENT_TYPES.add(Enumeration_3025);

-			KNOWN_ELEMENT_TYPES.add(Package_3009);

-			KNOWN_ELEMENT_TYPES.add(InformationItem_3040);

-			KNOWN_ELEMENT_TYPES.add(Class_3010);

-			KNOWN_ELEMENT_TYPES.add(PrimitiveType_3026);

-			KNOWN_ELEMENT_TYPES.add(DataType_3027);

-			KNOWN_ELEMENT_TYPES.add(Comment_3028);

-			KNOWN_ELEMENT_TYPES.add(Constraint_3029);

-			KNOWN_ELEMENT_TYPES.add(Interface_3036);

-			KNOWN_ELEMENT_TYPES.add(Interface_3037);

-			KNOWN_ELEMENT_TYPES.add(Interface_3038);

-			KNOWN_ELEMENT_TYPES.add(Enumeration_3052);

-			KNOWN_ELEMENT_TYPES.add(Enumeration_3053);

-			KNOWN_ELEMENT_TYPES.add(Enumeration_3054);

-			KNOWN_ELEMENT_TYPES.add(PrimitiveType_3047);

-			KNOWN_ELEMENT_TYPES.add(PrimitiveType_3046);

-			KNOWN_ELEMENT_TYPES.add(PrimitiveType_3048);

-			KNOWN_ELEMENT_TYPES.add(DataType_3044);

-			KNOWN_ELEMENT_TYPES.add(DataType_3045);

-			KNOWN_ELEMENT_TYPES.add(DataType_3043);

-			KNOWN_ELEMENT_TYPES.add(Signal_3050);

-			KNOWN_ELEMENT_TYPES.add(Signal_3051);

-			KNOWN_ELEMENT_TYPES.add(Signal_3049);

-			KNOWN_ELEMENT_TYPES.add(Link_4016);

-			KNOWN_ELEMENT_TYPES.add(AssociationClass_4017);

-			KNOWN_ELEMENT_TYPES.add(Association_4001);

-			KNOWN_ELEMENT_TYPES.add(Association_4019);

-			KNOWN_ELEMENT_TYPES.add(Generalization_4002);

-			KNOWN_ELEMENT_TYPES.add(InterfaceRealization_4003);

-			KNOWN_ELEMENT_TYPES.add(Substitution_4004);

-			KNOWN_ELEMENT_TYPES.add(Realization_4005);

-			KNOWN_ELEMENT_TYPES.add(Abstraction_4006);

-			KNOWN_ELEMENT_TYPES.add(Usage_4007);

-			KNOWN_ELEMENT_TYPES.add(Dependency_4008);

-			KNOWN_ELEMENT_TYPES.add(Dependency_4018);

-			KNOWN_ELEMENT_TYPES.add(ElementImport_4009);

-			KNOWN_ELEMENT_TYPES.add(PackageImport_4010);

-			KNOWN_ELEMENT_TYPES.add(PackageMerge_4011);

-			KNOWN_ELEMENT_TYPES.add(ProfileApplication_4012);

-			KNOWN_ELEMENT_TYPES.add(CommentAnnotatedElement_4013);

-			KNOWN_ELEMENT_TYPES.add(ConstraintConstrainedElement_4014);

-			KNOWN_ELEMENT_TYPES.add(TemplateBinding_4015);

-			KNOWN_ELEMENT_TYPES.add(GeneralizationSet_4020);

-			KNOWN_ELEMENT_TYPES.add(InstanceSpecification_4021);

-			KNOWN_ELEMENT_TYPES.add(Link_4022);

-			KNOWN_ELEMENT_TYPES.add(Link_4023);

-			KNOWN_ELEMENT_TYPES.add(TimeObservationEvent_4024);

-			KNOWN_ELEMENT_TYPES.add(DurationObservationEvent_4025);

-			KNOWN_ELEMENT_TYPES.add(InformationFlow_4026);

-			KNOWN_ELEMENT_TYPES.add(ConstraintContext_8500);

-		}

-		return KNOWN_ELEMENT_TYPES.contains(elementType);

-	}

-

-	/**

-	 * @generated

-	 */

-	public static IElementType getElementType(int visualID) {

-		switch (visualID) {

-		case ModelEditPart.VISUAL_ID:

-			return Package_1000;

-		case DependencyNodeEditPart.VISUAL_ID:

-			return Dependency_2014;

-		case AssociationClassEditPart.VISUAL_ID:

-			return AssociationClass_2013;

-		case AssociationNodeEditPart.VISUAL_ID:

-			return Association_2015;

-		case InstanceSpecificationEditPart.VISUAL_ID:

-			return InstanceSpecification_2001;

-		case ComponentEditPart.VISUAL_ID:

-			return Component_2002;

-		case SignalEditPart.VISUAL_ID:

-			return Signal_2003;

-		case InterfaceEditPart.VISUAL_ID:

-			return Interface_2004;

-		case ModelEditPartTN.VISUAL_ID:

-			return Model_2005;

-		case EnumerationEditPart.VISUAL_ID:

-			return Enumeration_2006;

-		case PackageEditPart.VISUAL_ID:

-			return Package_2007;

-		case InformationItemEditPart.VISUAL_ID:

-			return InformationItem_2099;

-		case ClassEditPart.VISUAL_ID:

-			return Class_2008;

-		case PrimitiveTypeEditPart.VISUAL_ID:

-			return PrimitiveType_2009;

-		case DataTypeEditPart.VISUAL_ID:

-			return DataType_2010;

-		case ConstraintEditPart.VISUAL_ID:

-			return Constraint_2011;

-		case CommentEditPart.VISUAL_ID:

-			return Comment_2012;

-		case ShortCutDiagramEditPart.VISUAL_ID:

-			return Diagram_2016;

-		case DurationObservationEditPart.VISUAL_ID:

-			return DurationObservation_2095;

-		case TimeObservationEditPart.VISUAL_ID:

-			return TimeObservation_2096;

-		case DefaultNamedElementEditPart.VISUAL_ID:

-			return NamedElement_2097;

-		case PropertyForClassEditPart.VISUAL_ID:

-			return Property_3012;

-		case PropertyForComponentEditPart.VISUAL_ID:

-			return Property_3002;

-		case PropertyForSignalEditPart.VISUAL_ID:

-			return Property_3005;

-		case PropertyForInterfaceEditPart.VISUAL_ID:

-			return Property_3006;

-		case PropertyforPrimitiveTypeEditPart.VISUAL_ID:

-			return Property_3041;

-		case PropertyforDataTypeEditPart.VISUAL_ID:

-			return Property_3018;

-		case NestedClassForClassEditPart.VISUAL_ID:

-			return Class_3014;

-		case NestedClassForComponentEditPart.VISUAL_ID:

-			return Class_3004;

-		case NestedClassForInterfaceEditPart.VISUAL_ID:

-			return Class_3008;

-		case OperationForClassEditPart.VISUAL_ID:

-			return Operation_3013;

-		case OperationForComponentEditPart.VISUAL_ID:

-			return Operation_3003;

-		case OperationForInterfaceEditpart.VISUAL_ID:

-			return Operation_3007;

-		case OperationForPrimitiveTypeEditPart.VISUAL_ID:

-			return Operation_3042;

-		case OperationForDataTypeEditPart.VISUAL_ID:

-			return Operation_3019;

-		case ConnectableElementTemplateParameterEditPart.VISUAL_ID:

-			return ConnectableElementTemplateParameter_3034;

-		case OperationTemplateParameterEditPart.VISUAL_ID:

-			return OperationTemplateParameter_3035;

-		case ClassifierTemplateParameterEditPart.VISUAL_ID:

-			return ClassifierTemplateParameter_3031;

-		case TemplateParameterEditPart.VISUAL_ID:

-			return TemplateParameter_3016;

-		case EnumerationLiteralEditPart.VISUAL_ID:

-			return EnumerationLiteral_3017;

-		case ReceptionEditPart.VISUAL_ID:

-			return Reception_3011;

-		case ReceptionInInterfaceEditPart.VISUAL_ID:

-			return Reception_3039;

-		case SlotEditPart.VISUAL_ID:

-			return Slot_3030;

-		case RedefinableTemplateSignatureEditPart.VISUAL_ID:

-			return RedefinableTemplateSignature_3015;

-		case ContainmentCircleEditPart.VISUAL_ID:

-			return Node_3032;

-		case TemplateSignatureEditPart.VISUAL_ID:

-			return TemplateSignature_3033;

-		case InstanceSpecificationEditPartCN.VISUAL_ID:

-			return InstanceSpecification_3020;

-		case ComponentEditPartCN.VISUAL_ID:

-			return Component_3021;

-		case SignalEditPartCN.VISUAL_ID:

-			return Signal_3022;

-		case InterfaceEditPartCN.VISUAL_ID:

-			return Interface_3023;

-		case ModelEditPartCN.VISUAL_ID:

-			return Model_3024;

-		case EnumerationEditPartCN.VISUAL_ID:

-			return Enumeration_3025;

-		case PackageEditPartCN.VISUAL_ID:

-			return Package_3009;

-		case InformationItemEditPartCN.VISUAL_ID:

-			return InformationItem_3040;

-		case ClassEditPartCN.VISUAL_ID:

-			return Class_3010;

-		case PrimitiveTypeEditPartCN.VISUAL_ID:

-			return PrimitiveType_3026;

-		case DataTypeEditPartCN.VISUAL_ID:

-			return DataType_3027;

-		case CommentEditPartCN.VISUAL_ID:

-			return Comment_3028;

-		case ConstraintEditPartCN.VISUAL_ID:

-			return Constraint_3029;

-		case NestedInterfaceForClassEditPart.VISUAL_ID:

-			return Interface_3036;

-		case NestedInterfaceForComponentEditPart.VISUAL_ID:

-			return Interface_3037;

-		case NestedInterfaceForInterfaceEditPart.VISUAL_ID:

-			return Interface_3038;

-		case NestedEnumerationForClassEditPart.VISUAL_ID:

-			return Enumeration_3052;

-		case NestedEnumerationForComponentEditPart.VISUAL_ID:

-			return Enumeration_3053;

-		case NestedEnumerationForInterfaceEditPart.VISUAL_ID:

-			return Enumeration_3054;

-		case NestedPrimitiveTypeForClassEditPart.VISUAL_ID:

-			return PrimitiveType_3047;

-		case NestedPrimitiveTypeForComponentEditPart.VISUAL_ID:

-			return PrimitiveType_3046;

-		case NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID:

-			return PrimitiveType_3048;

-		case NestedDataTypeForClassEditPart.VISUAL_ID:

-			return DataType_3044;

-		case NestedDataTypeForComponentEditPart.VISUAL_ID:

-			return DataType_3045;

-		case NestedDataTypeForInterfaceEditPart.VISUAL_ID:

-			return DataType_3043;

-		case NestedSignalForClassEditPart.VISUAL_ID:

-			return Signal_3050;

-		case NestedSignalForComponentEditPart.VISUAL_ID:

-			return Signal_3051;

-		case NestedSignalForInterfaceEditPart.VISUAL_ID:

-			return Signal_3049;

-		case AssociationClassDashedLinkEditPart.VISUAL_ID:

-			return Link_4016;

-		case AssociationClassLinkEditPart.VISUAL_ID:

-			return AssociationClass_4017;

-		case AssociationEditPart.VISUAL_ID:

-			return Association_4001;

-		case AssociationBranchEditPart.VISUAL_ID:

-			return Association_4019;

-		case GeneralizationEditPart.VISUAL_ID:

-			return Generalization_4002;

-		case InterfaceRealizationEditPart.VISUAL_ID:

-			return InterfaceRealization_4003;

-		case SubstitutionEditPart.VISUAL_ID:

-			return Substitution_4004;

-		case RealizationEditPart.VISUAL_ID:

-			return Realization_4005;

-		case AbstractionEditPart.VISUAL_ID:

-			return Abstraction_4006;

-		case UsageEditPart.VISUAL_ID:

-			return Usage_4007;

-		case DependencyEditPart.VISUAL_ID:

-			return Dependency_4008;

-		case DependencyBranchEditPart.VISUAL_ID:

-			return Dependency_4018;

-		case ElementImportEditPart.VISUAL_ID:

-			return ElementImport_4009;

-		case PackageImportEditPart.VISUAL_ID:

-			return PackageImport_4010;

-		case PackageMergeEditPart.VISUAL_ID:

-			return PackageMerge_4011;

-		case ProfileApplicationEditPart.VISUAL_ID:

-			return ProfileApplication_4012;

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return CommentAnnotatedElement_4013;

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return ConstraintConstrainedElement_4014;

-		case TemplateBindingEditPart.VISUAL_ID:

-			return TemplateBinding_4015;

-		case GeneralizationSetEditPart.VISUAL_ID:

-			return GeneralizationSet_4020;

-		case InstanceSpecificationLinkEditPart.VISUAL_ID:

-			return InstanceSpecification_4021;

-		case ContainmentSubLinkEditPart.VISUAL_ID:

-			return Link_4022;

-		case ContainmentLinkEditPart.VISUAL_ID:

-			return Link_4023;

-		case ConnectorTimeObservationEditPart.VISUAL_ID:

-			return TimeObservationEvent_4024;

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return DurationObservationEvent_4025;

-		case InformationFlowEditPart.VISUAL_ID:

-			return InformationFlow_4026;

-		case ContextLinkEditPart.VISUAL_ID:

-			return ConstraintContext_8500;

-		}

-		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.clazz.providers.UMLElementTypes.isKnownElementType(elementType);

-		}

-

-		/**

-		 * @generated

-		 */

-		@Override

-		public IElementType getElementTypeForVisualId(int visualID) {

-			return org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes.getElementType(visualID);

-		}

-

-		/**

-		 * @generated

-		 */

-		@Override

-		public ENamedElement getDefiningNamedElement(IAdaptable elementTypeAdapter) {

-			return org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes.getElement(elementTypeAdapter);

-		}

-	};

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLIconProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLIconProvider.java
deleted file mode 100644
index e4d780d4e40..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLIconProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLMarkerNavigationProvider.java
deleted file mode 100644
index 9f9c3f9c7d5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLMarkerNavigationProvider.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLParserProvider.java
deleted file mode 100644
index cc32dc44b36..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLParserProvider.java
+++ /dev/null
@@ -1,2224 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.custom.parsers.GeneralizationSetConstraintParser;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.parsers.RoleInstanceSpecificationLinkParser;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.parsers.SlotParser;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.parsers.TemplateBindingParser;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.parsers.TemplateParameterParser;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.*;

-import org.eclipse.papyrus.uml.diagram.clazz.parsers.MessageFormatParser;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-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.ShortcutDiagramParser;

-import org.eclipse.papyrus.uml.diagram.common.parser.packageimport.PackageImportVisibilityParser;

-import org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class UMLParserProvider extends AbstractProvider implements IParserProvider {

-

-	/**

-	 * @generated

-	 */

-	private IParser dependencyName_1Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getDependencyName_1Parser() {

-		if (dependencyName_1Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			dependencyName_1Parser = parser;

-		}

-		return dependencyName_1Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser associationClassName_5066Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getAssociationClassName_5066Parser() {

-		if (associationClassName_5066Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			associationClassName_5066Parser = parser;

-		}

-		return associationClassName_5066Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser instanceSpecificationName_5002Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getInstanceSpecificationName_5002Parser() {

-		if (instanceSpecificationName_5002Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			instanceSpecificationName_5002Parser = parser;

-		}

-		return instanceSpecificationName_5002Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser componentName_5005Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getComponentName_5005Parser() {

-		if (componentName_5005Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			componentName_5005Parser = parser;

-		}

-		return componentName_5005Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser signalName_5008Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getSignalName_5008Parser() {

-		if (signalName_5008Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			signalName_5008Parser = parser;

-		}

-		return signalName_5008Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser interfaceName_5011Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getInterfaceName_5011Parser() {

-		if (interfaceName_5011Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			interfaceName_5011Parser = parser;

-		}

-		return interfaceName_5011Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser modelName_5020Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getModelName_5020Parser() {

-		if (modelName_5020Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			modelName_5020Parser = parser;

-		}

-		return modelName_5020Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser enumerationName_5023Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getEnumerationName_5023Parser() {

-		if (enumerationName_5023Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			enumerationName_5023Parser = parser;

-		}

-		return enumerationName_5023Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser packageName_5026Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getPackageName_5026Parser() {

-		if (packageName_5026Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			packageName_5026Parser = parser;

-		}

-		return packageName_5026Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser informationItemName_5161Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getInformationItemName_5161Parser() {

-		if (informationItemName_5161Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			informationItemName_5161Parser = parser;

-		}

-		return informationItemName_5161Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser className_5029Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getClassName_5029Parser() {

-		if (className_5029Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			className_5029Parser = parser;

-		}

-		return className_5029Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser primitiveTypeName_5032Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getPrimitiveTypeName_5032Parser() {

-		if (primitiveTypeName_5032Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			primitiveTypeName_5032Parser = parser;

-		}

-		return primitiveTypeName_5032Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser dataTypeName_5035Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getDataTypeName_5035Parser() {

-		if (dataTypeName_5035Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			dataTypeName_5035Parser = parser;

-		}

-		return dataTypeName_5035Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser constraintName_5037Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getConstraintName_5037Parser() {

-		if (constraintName_5037Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			constraintName_5037Parser = parser;

-		}

-		return constraintName_5037Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private ConstraintParser constraintSpecification_5159Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getConstraintSpecification_5159Parser() {

-		if (constraintSpecification_5159Parser == null) {

-			constraintSpecification_5159Parser = new ConstraintParser();

-		}

-		return constraintSpecification_5159Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private CommentParser commentBody_5038Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getCommentBody_5038Parser() {

-		if (commentBody_5038Parser == null) {

-			commentBody_5038Parser = new CommentParser();

-		}

-		return commentBody_5038Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private ShortcutDiagramParser diagramName_0Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getDiagramName_0Parser() {

-		if (diagramName_0Parser == null) {

-			diagramName_0Parser = new ShortcutDiagramParser();

-		}

-		return diagramName_0Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser durationObservationName_5155Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getDurationObservationName_5155Parser() {

-		if (durationObservationName_5155Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			durationObservationName_5155Parser = parser;

-		}

-		return durationObservationName_5155Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private AppliedStereotypeParser durationObservationName_5156Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getDurationObservationName_5156Parser() {

-		if (durationObservationName_5156Parser == null) {

-			durationObservationName_5156Parser = new AppliedStereotypeParser();

-		}

-		return durationObservationName_5156Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser timeObservationName_5153Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getTimeObservationName_5153Parser() {

-		if (timeObservationName_5153Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			timeObservationName_5153Parser = parser;

-		}

-		return timeObservationName_5153Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private AppliedStereotypeParser timeObservationName_5154Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getTimeObservationName_5154Parser() {

-		if (timeObservationName_5154Parser == null) {

-			timeObservationName_5154Parser = new AppliedStereotypeParser();

-		}

-		return timeObservationName_5154Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser namedElementName_5157Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getNamedElementName_5157Parser() {

-		if (namedElementName_5157Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			namedElementName_5157Parser = parser;

-		}

-		return namedElementName_5157Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser property_3002Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getProperty_3002Parser() {

-		if (property_3002Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			property_3002Parser = parser;

-		}

-		return property_3002Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser property_3005Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getProperty_3005Parser() {

-		if (property_3005Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			property_3005Parser = parser;

-		}

-		return property_3005Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser property_3006Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getProperty_3006Parser() {

-		if (property_3006Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			property_3006Parser = parser;

-		}

-		return property_3006Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser property_3041Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getProperty_3041Parser() {

-		if (property_3041Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			property_3041Parser = parser;

-		}

-		return property_3041Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser property_3018Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getProperty_3018Parser() {

-		if (property_3018Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			property_3018Parser = parser;

-		}

-		return property_3018Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser class_3014Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getClass_3014Parser() {

-		if (class_3014Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			class_3014Parser = parser;

-		}

-		return class_3014Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser class_3004Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getClass_3004Parser() {

-		if (class_3004Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			class_3004Parser = parser;

-		}

-		return class_3004Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser class_3008Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getClass_3008Parser() {

-		if (class_3008Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			class_3008Parser = parser;

-		}

-		return class_3008Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser operation_3003Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getOperation_3003Parser() {

-		if (operation_3003Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			operation_3003Parser = parser;

-		}

-		return operation_3003Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser operation_3007Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getOperation_3007Parser() {

-		if (operation_3007Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			operation_3007Parser = parser;

-		}

-		return operation_3007Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser operation_3042Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getOperation_3042Parser() {

-		if (operation_3042Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			operation_3042Parser = parser;

-		}

-		return operation_3042Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser operation_3019Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getOperation_3019Parser() {

-		if (operation_3019Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			operation_3019Parser = parser;

-		}

-		return operation_3019Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private TemplateParameterParser connectableElementTemplateParameter_3034Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getConnectableElementTemplateParameter_3034Parser() {

-		if (connectableElementTemplateParameter_3034Parser == null) {

-			connectableElementTemplateParameter_3034Parser = new TemplateParameterParser();

-		}

-		return connectableElementTemplateParameter_3034Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private TemplateParameterParser operationTemplateParameter_3035Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getOperationTemplateParameter_3035Parser() {

-		if (operationTemplateParameter_3035Parser == null) {

-			operationTemplateParameter_3035Parser = new TemplateParameterParser();

-		}

-		return operationTemplateParameter_3035Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private TemplateParameterParser classifierTemplateParameter_3031Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getClassifierTemplateParameter_3031Parser() {

-		if (classifierTemplateParameter_3031Parser == null) {

-			classifierTemplateParameter_3031Parser = new TemplateParameterParser();

-		}

-		return classifierTemplateParameter_3031Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private TemplateParameterParser templateParameter_3016Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getTemplateParameter_3016Parser() {

-		if (templateParameter_3016Parser == null) {

-			templateParameter_3016Parser = new TemplateParameterParser();

-		}

-		return templateParameter_3016Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser enumerationLiteral_3017Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getEnumerationLiteral_3017Parser() {

-		if (enumerationLiteral_3017Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			enumerationLiteral_3017Parser = parser;

-		}

-		return enumerationLiteral_3017Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser reception_3011Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getReception_3011Parser() {

-		if (reception_3011Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			parser.setViewPattern("\u00ABSignal\u00BB {0}"); //$NON-NLS-1$

-			parser.setEditorPattern("{0}"); //$NON-NLS-1$

-			parser.setEditPattern("{0}"); //$NON-NLS-1$

-			reception_3011Parser = parser;

-		}

-		return reception_3011Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser reception_3039Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getReception_3039Parser() {

-		if (reception_3039Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			parser.setViewPattern("\u00ABSignal\u00BB {0}"); //$NON-NLS-1$

-			parser.setEditorPattern("{0}"); //$NON-NLS-1$

-			parser.setEditPattern("{0}"); //$NON-NLS-1$

-			reception_3039Parser = parser;

-		}

-		return reception_3039Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private SlotParser slot_3030Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getSlot_3030Parser() {

-		if (slot_3030Parser == null) {

-			slot_3030Parser = new SlotParser();

-		}

-		return slot_3030Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser instanceSpecificationName_5040Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getInstanceSpecificationName_5040Parser() {

-		if (instanceSpecificationName_5040Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			instanceSpecificationName_5040Parser = parser;

-		}

-		return instanceSpecificationName_5040Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser componentName_5043Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getComponentName_5043Parser() {

-		if (componentName_5043Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			componentName_5043Parser = parser;

-		}

-		return componentName_5043Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser signalName_5046Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getSignalName_5046Parser() {

-		if (signalName_5046Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			signalName_5046Parser = parser;

-		}

-		return signalName_5046Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser interfaceName_5049Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getInterfaceName_5049Parser() {

-		if (interfaceName_5049Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			interfaceName_5049Parser = parser;

-		}

-		return interfaceName_5049Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser modelName_5052Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getModelName_5052Parser() {

-		if (modelName_5052Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			modelName_5052Parser = parser;

-		}

-		return modelName_5052Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser enumerationName_5055Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getEnumerationName_5055Parser() {

-		if (enumerationName_5055Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			enumerationName_5055Parser = parser;

-		}

-		return enumerationName_5055Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser packageName_5017Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getPackageName_5017Parser() {

-		if (packageName_5017Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			packageName_5017Parser = parser;

-		}

-		return packageName_5017Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser informationItemName_5162Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getInformationItemName_5162Parser() {

-		if (informationItemName_5162Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			informationItemName_5162Parser = parser;

-		}

-		return informationItemName_5162Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser className_5014Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getClassName_5014Parser() {

-		if (className_5014Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			className_5014Parser = parser;

-		}

-		return className_5014Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser primitiveTypeName_5058Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getPrimitiveTypeName_5058Parser() {

-		if (primitiveTypeName_5058Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			primitiveTypeName_5058Parser = parser;

-		}

-		return primitiveTypeName_5058Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser dataTypeName_5061Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getDataTypeName_5061Parser() {

-		if (dataTypeName_5061Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			dataTypeName_5061Parser = parser;

-		}

-		return dataTypeName_5061Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private CommentParser commentBody_5063Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getCommentBody_5063Parser() {

-		if (commentBody_5063Parser == null) {

-			commentBody_5063Parser = new CommentParser();

-		}

-		return commentBody_5063Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser constraintName_5064Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getConstraintName_5064Parser() {

-		if (constraintName_5064Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			constraintName_5064Parser = parser;

-		}

-		return constraintName_5064Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private ConstraintParser constraintSpecification_5160Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getConstraintSpecification_5160Parser() {

-		if (constraintSpecification_5160Parser == null) {

-			constraintSpecification_5160Parser = new ConstraintParser();

-		}

-		return constraintSpecification_5160Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser interface_3036Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getInterface_3036Parser() {

-		if (interface_3036Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			interface_3036Parser = parser;

-		}

-		return interface_3036Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser interface_3037Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getInterface_3037Parser() {

-		if (interface_3037Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			interface_3037Parser = parser;

-		}

-		return interface_3037Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser interface_3038Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getInterface_3038Parser() {

-		if (interface_3038Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			interface_3038Parser = parser;

-		}

-		return interface_3038Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser enumeration_3052Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getEnumeration_3052Parser() {

-		if (enumeration_3052Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			enumeration_3052Parser = parser;

-		}

-		return enumeration_3052Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser enumeration_3053Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getEnumeration_3053Parser() {

-		if (enumeration_3053Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			enumeration_3053Parser = parser;

-		}

-		return enumeration_3053Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser enumeration_3054Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getEnumeration_3054Parser() {

-		if (enumeration_3054Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			enumeration_3054Parser = parser;

-		}

-		return enumeration_3054Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser primitiveType_3047Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getPrimitiveType_3047Parser() {

-		if (primitiveType_3047Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			primitiveType_3047Parser = parser;

-		}

-		return primitiveType_3047Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser primitiveType_3046Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getPrimitiveType_3046Parser() {

-		if (primitiveType_3046Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			primitiveType_3046Parser = parser;

-		}

-		return primitiveType_3046Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser primitiveType_3048Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getPrimitiveType_3048Parser() {

-		if (primitiveType_3048Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			primitiveType_3048Parser = parser;

-		}

-		return primitiveType_3048Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser dataType_3044Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getDataType_3044Parser() {

-		if (dataType_3044Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			dataType_3044Parser = parser;

-		}

-		return dataType_3044Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser dataType_3045Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getDataType_3045Parser() {

-		if (dataType_3045Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			dataType_3045Parser = parser;

-		}

-		return dataType_3045Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser dataType_3043Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getDataType_3043Parser() {

-		if (dataType_3043Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			dataType_3043Parser = parser;

-		}

-		return dataType_3043Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser signal_3050Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getSignal_3050Parser() {

-		if (signal_3050Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			signal_3050Parser = parser;

-		}

-		return signal_3050Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser signal_3051Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getSignal_3051Parser() {

-		if (signal_3051Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			signal_3051Parser = parser;

-		}

-		return signal_3051Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser signal_3049Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getSignal_3049Parser() {

-		if (signal_3049Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			signal_3049Parser = parser;

-		}

-		return signal_3049Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser associationClassName_6031Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getAssociationClassName_6031Parser() {

-		if (associationClassName_6031Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			parser.setViewPattern("srcRole{0}"); //$NON-NLS-1$

-			parser.setEditorPattern("srcRole{0}"); //$NON-NLS-1$

-			parser.setEditPattern("srcRole{0}"); //$NON-NLS-1$

-			associationClassName_6031Parser = parser;

-		}

-		return associationClassName_6031Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser associationClassName_6032Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getAssociationClassName_6032Parser() {

-		if (associationClassName_6032Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			parser.setViewPattern("targetRole{0}"); //$NON-NLS-1$

-			parser.setEditorPattern("targetRole{0}"); //$NON-NLS-1$

-			parser.setEditPattern("targetRole{0}"); //$NON-NLS-1$

-			associationClassName_6032Parser = parser;

-		}

-		return associationClassName_6032Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private AppliedStereotypeParser associationName_6001Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getAssociationName_6001Parser() {

-		if (associationName_6001Parser == null) {

-			associationName_6001Parser = new AppliedStereotypeParser();

-		}

-		return associationName_6001Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser associationName_6002Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getAssociationName_6002Parser() {

-		if (associationName_6002Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			associationName_6002Parser = parser;

-		}

-		return associationName_6002Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser associationName_6003Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getAssociationName_6003Parser() {

-		if (associationName_6003Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			parser.setViewPattern("srcRole{0}"); //$NON-NLS-1$

-			parser.setEditorPattern("srcRole{0}"); //$NON-NLS-1$

-			parser.setEditPattern("srcRole{0}"); //$NON-NLS-1$

-			associationName_6003Parser = parser;

-		}

-		return associationName_6003Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser associationName_6005Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getAssociationName_6005Parser() {

-		if (associationName_6005Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			parser.setViewPattern("targMul{0}"); //$NON-NLS-1$

-			parser.setEditorPattern("targMul{0}"); //$NON-NLS-1$

-			parser.setEditPattern("targMul{0}"); //$NON-NLS-1$

-			associationName_6005Parser = parser;

-		}

-		return associationName_6005Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser associationName_6033Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getAssociationName_6033Parser() {

-		if (associationName_6033Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			parser.setViewPattern("srcMul{0}"); //$NON-NLS-1$

-			parser.setEditorPattern("srcMul{0}"); //$NON-NLS-1$

-			parser.setEditPattern("srcMul{0}"); //$NON-NLS-1$

-			associationName_6033Parser = parser;

-		}

-		return associationName_6033Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser associationName_6034Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getAssociationName_6034Parser() {

-		if (associationName_6034Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			parser.setViewPattern("srcMul{0}"); //$NON-NLS-1$

-			parser.setEditorPattern("srcMul{0}"); //$NON-NLS-1$

-			parser.setEditPattern("srcMul{0}"); //$NON-NLS-1$

-			associationName_6034Parser = parser;

-		}

-		return associationName_6034Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser associationName_6035Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getAssociationName_6035Parser() {

-		if (associationName_6035Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			parser.setViewPattern("srcRole{0}"); //$NON-NLS-1$

-			parser.setEditorPattern("srcRole{0}"); //$NON-NLS-1$

-			parser.setEditPattern("srcRole{0}"); //$NON-NLS-1$

-			associationName_6035Parser = parser;

-		}

-		return associationName_6035Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser generalizationIsSubstitutable_6007Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getGeneralizationIsSubstitutable_6007Parser() {

-		if (generalizationIsSubstitutable_6007Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getGeneralization_IsSubstitutable()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			parser.setViewPattern("<<{0}>>"); //$NON-NLS-1$

-			parser.setEditorPattern("<<{0}>>"); //$NON-NLS-1$

-			parser.setEditPattern("<<{0}>>"); //$NON-NLS-1$

-			generalizationIsSubstitutable_6007Parser = parser;

-		}

-		return generalizationIsSubstitutable_6007Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private AppliedStereotypeParser interfaceRealizationName_6008Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getInterfaceRealizationName_6008Parser() {

-		if (interfaceRealizationName_6008Parser == null) {

-			interfaceRealizationName_6008Parser = new AppliedStereotypeParser();

-		}

-		return interfaceRealizationName_6008Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser interfaceRealizationName_6009Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getInterfaceRealizationName_6009Parser() {

-		if (interfaceRealizationName_6009Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			interfaceRealizationName_6009Parser = parser;

-		}

-		return interfaceRealizationName_6009Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private AppliedStereotypeParser substitutionName_6010Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getSubstitutionName_6010Parser() {

-		if (substitutionName_6010Parser == null) {

-			substitutionName_6010Parser = new AppliedStereotypeParser();

-		}

-		return substitutionName_6010Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser substitutionName_6011Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getSubstitutionName_6011Parser() {

-		if (substitutionName_6011Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			substitutionName_6011Parser = parser;

-		}

-		return substitutionName_6011Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private AppliedStereotypeParser realizationName_6012Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getRealizationName_6012Parser() {

-		if (realizationName_6012Parser == null) {

-			realizationName_6012Parser = new AppliedStereotypeParser();

-		}

-		return realizationName_6012Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser realizationName_6013Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getRealizationName_6013Parser() {

-		if (realizationName_6013Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			realizationName_6013Parser = parser;

-		}

-		return realizationName_6013Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser abstractionName_6014Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getAbstractionName_6014Parser() {

-		if (abstractionName_6014Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			abstractionName_6014Parser = parser;

-		}

-		return abstractionName_6014Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private AppliedStereotypeParser abstractionName_6015Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getAbstractionName_6015Parser() {

-		if (abstractionName_6015Parser == null) {

-			abstractionName_6015Parser = new AppliedStereotypeParser();

-		}

-		return abstractionName_6015Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser usageName_6016Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getUsageName_6016Parser() {

-		if (usageName_6016Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			usageName_6016Parser = parser;

-		}

-		return usageName_6016Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private AppliedStereotypeParser usageName_6017Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getUsageName_6017Parser() {

-		if (usageName_6017Parser == null) {

-			usageName_6017Parser = new AppliedStereotypeParser();

-		}

-		return usageName_6017Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser dependencyName_6026Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getDependencyName_6026Parser() {

-		if (dependencyName_6026Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			dependencyName_6026Parser = parser;

-		}

-		return dependencyName_6026Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private AppliedStereotypeParser dependencyName_6027Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getDependencyName_6027Parser() {

-		if (dependencyName_6027Parser == null) {

-			dependencyName_6027Parser = new AppliedStereotypeParser();

-		}

-		return dependencyName_6027Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private IParser elementImportAlias_6020Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getElementImportAlias_6020Parser() {

-		if (elementImportAlias_6020Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getElementImport_Alias()

-			};

-			MessageFormatParser parser = new MessageFormatParser(features);

-			elementImportAlias_6020Parser = parser;

-		}

-		return elementImportAlias_6020Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private AppliedStereotypeParser elementImportAlias_6021Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getElementImportAlias_6021Parser() {

-		if (elementImportAlias_6021Parser == null) {

-			elementImportAlias_6021Parser = new AppliedStereotypeParser();

-		}

-		return elementImportAlias_6021Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private PackageImportVisibilityParser packageImportVisibility_6022Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getPackageImportVisibility_6022Parser() {

-		if (packageImportVisibility_6022Parser == null) {

-			packageImportVisibility_6022Parser = new PackageImportVisibilityParser();

-		}

-		return packageImportVisibility_6022Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private AppliedStereotypeParser packageMergeLabel_6030Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getPackageMergeLabel_6030Parser() {

-		if (packageMergeLabel_6030Parser == null) {

-			packageMergeLabel_6030Parser = new AppliedStereotypeParser();

-		}

-		return packageMergeLabel_6030Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private TemplateBindingParser templateBindingLabel_6023Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getTemplateBindingLabel_6023Parser() {

-		if (templateBindingLabel_6023Parser == null) {

-			templateBindingLabel_6023Parser = new TemplateBindingParser();

-		}

-		return templateBindingLabel_6023Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private AppliedStereotypeParser templateBindingLabel_6036Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getTemplateBindingLabel_6036Parser() {

-		if (templateBindingLabel_6036Parser == null) {

-			templateBindingLabel_6036Parser = new AppliedStereotypeParser();

-		}

-		return templateBindingLabel_6036Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private GeneralizationSetConstraintParser generalizationSetIsCoveringIsDisjoint_5067Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getGeneralizationSetIsCoveringIsDisjoint_5067Parser() {

-		if (generalizationSetIsCoveringIsDisjoint_5067Parser == null) {

-			generalizationSetIsCoveringIsDisjoint_5067Parser = new GeneralizationSetConstraintParser();

-		}

-		return generalizationSetIsCoveringIsDisjoint_5067Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private AppliedStereotypeParser generalizationSetLabel_6037Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getGeneralizationSetLabel_6037Parser() {

-		if (generalizationSetLabel_6037Parser == null) {

-			generalizationSetLabel_6037Parser = new AppliedStereotypeParser();

-		}

-		return generalizationSetLabel_6037Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private RoleInstanceSpecificationLinkParser instanceSpecificationLabel_6039Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getInstanceSpecificationLabel_6039Parser() {

-		if (instanceSpecificationLabel_6039Parser == null) {

-			instanceSpecificationLabel_6039Parser = new RoleInstanceSpecificationLinkParser();

-		}

-		return instanceSpecificationLabel_6039Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private RoleInstanceSpecificationLinkParser instanceSpecificationLabel_6038Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getInstanceSpecificationLabel_6038Parser() {

-		if (instanceSpecificationLabel_6038Parser == null) {

-			instanceSpecificationLabel_6038Parser = new RoleInstanceSpecificationLinkParser();

-		}

-		return instanceSpecificationLabel_6038Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	private AppliedStereotypeParser informationFlowName_6041Parser;

-

-	/**

-	 * @generated

-	 */

-	private IParser getInformationFlowName_6041Parser() {

-		if (informationFlowName_6041Parser == null) {

-			informationFlowName_6041Parser = new AppliedStereotypeParser();

-		}

-		return informationFlowName_6041Parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected IParser getParser(int visualID) {

-		switch (visualID) {

-		case MultiDependencyLabelEditPart.VISUAL_ID:

-			return getDependencyName_1Parser();

-		case AssociationClassNameEditPart.VISUAL_ID:

-			return getAssociationClassName_5066Parser();

-		case InstanceSpecificationNameEditPart.VISUAL_ID:

-			return getInstanceSpecificationName_5002Parser();

-		case ComponentNameEditPart.VISUAL_ID:

-			return getComponentName_5005Parser();

-		case SignalNameEditPart.VISUAL_ID:

-			return getSignalName_5008Parser();

-		case InterfaceNameEditPart.VISUAL_ID:

-			return getInterfaceName_5011Parser();

-		case ModelNameEditPartTN.VISUAL_ID:

-			return getModelName_5020Parser();

-		case EnumerationNameEditPart.VISUAL_ID:

-			return getEnumerationName_5023Parser();

-		case PackageNameEditPart.VISUAL_ID:

-			return getPackageName_5026Parser();

-		case InformationItemNameEditPart.VISUAL_ID:

-			return getInformationItemName_5161Parser();

-		case ClassNameEditPart.VISUAL_ID:

-			return getClassName_5029Parser();

-		case PrimitiveTypeNameEditPart.VISUAL_ID:

-			return getPrimitiveTypeName_5032Parser();

-		case DataTypeNameEditPart.VISUAL_ID:

-			return getDataTypeName_5035Parser();

-		case ConstraintNameEditPart.VISUAL_ID:

-			return getConstraintName_5037Parser();

-		case ConstraintBodyEditPart.VISUAL_ID:

-			return getConstraintSpecification_5159Parser();

-		case CommentBodyEditPart.VISUAL_ID:

-			return getCommentBody_5038Parser();

-		case DiagramNameEditPart.VISUAL_ID:

-			return getDiagramName_0Parser();

-		case DurationObservationNameEditPart.VISUAL_ID:

-			return getDurationObservationName_5155Parser();

-		case DurationObservationStereotypeLabelEditPart.VISUAL_ID:

-			return getDurationObservationName_5156Parser();

-		case TimeObservationNameEditPart.VISUAL_ID:

-			return getTimeObservationName_5153Parser();

-		case TimeObservationStereotypeLabelEditPart.VISUAL_ID:

-			return getTimeObservationName_5154Parser();

-		case DefaultNamedElementNameEditPart.VISUAL_ID:

-			return getNamedElementName_5157Parser();

-		case PropertyForComponentEditPart.VISUAL_ID:

-			return getProperty_3002Parser();

-		case PropertyForSignalEditPart.VISUAL_ID:

-			return getProperty_3005Parser();

-		case PropertyForInterfaceEditPart.VISUAL_ID:

-			return getProperty_3006Parser();

-		case PropertyforPrimitiveTypeEditPart.VISUAL_ID:

-			return getProperty_3041Parser();

-		case PropertyforDataTypeEditPart.VISUAL_ID:

-			return getProperty_3018Parser();

-		case NestedClassForClassEditPart.VISUAL_ID:

-			return getClass_3014Parser();

-		case NestedClassForComponentEditPart.VISUAL_ID:

-			return getClass_3004Parser();

-		case NestedClassForInterfaceEditPart.VISUAL_ID:

-			return getClass_3008Parser();

-		case OperationForComponentEditPart.VISUAL_ID:

-			return getOperation_3003Parser();

-		case OperationForInterfaceEditpart.VISUAL_ID:

-			return getOperation_3007Parser();

-		case OperationForPrimitiveTypeEditPart.VISUAL_ID:

-			return getOperation_3042Parser();

-		case OperationForDataTypeEditPart.VISUAL_ID:

-			return getOperation_3019Parser();

-		case ConnectableElementTemplateParameterEditPart.VISUAL_ID:

-			return getConnectableElementTemplateParameter_3034Parser();

-		case OperationTemplateParameterEditPart.VISUAL_ID:

-			return getOperationTemplateParameter_3035Parser();

-		case ClassifierTemplateParameterEditPart.VISUAL_ID:

-			return getClassifierTemplateParameter_3031Parser();

-		case TemplateParameterEditPart.VISUAL_ID:

-			return getTemplateParameter_3016Parser();

-		case EnumerationLiteralEditPart.VISUAL_ID:

-			return getEnumerationLiteral_3017Parser();

-		case ReceptionEditPart.VISUAL_ID:

-			return getReception_3011Parser();

-		case ReceptionInInterfaceEditPart.VISUAL_ID:

-			return getReception_3039Parser();

-		case SlotEditPart.VISUAL_ID:

-			return getSlot_3030Parser();

-		case InstanceSpecificationNameEditPartCN.VISUAL_ID:

-			return getInstanceSpecificationName_5040Parser();

-		case ComponentNameEditPartCN.VISUAL_ID:

-			return getComponentName_5043Parser();

-		case SignalNameEditPartCN.VISUAL_ID:

-			return getSignalName_5046Parser();

-		case InterfaceNameEditPartCN.VISUAL_ID:

-			return getInterfaceName_5049Parser();

-		case ModelNameEditPartCN.VISUAL_ID:

-			return getModelName_5052Parser();

-		case EnumerationNameEditPartCN.VISUAL_ID:

-			return getEnumerationName_5055Parser();

-		case PackageNameEditPartCN.VISUAL_ID:

-			return getPackageName_5017Parser();

-		case InformationItemNameEditPartCN.VISUAL_ID:

-			return getInformationItemName_5162Parser();

-		case ClassNameEditPartCN.VISUAL_ID:

-			return getClassName_5014Parser();

-		case PrimitiveTypeNameEditPartCN.VISUAL_ID:

-			return getPrimitiveTypeName_5058Parser();

-		case DataTypeNameEditPartCN.VISUAL_ID:

-			return getDataTypeName_5061Parser();

-		case CommentBodyEditPartCN.VISUAL_ID:

-			return getCommentBody_5063Parser();

-		case ConstraintNameEditPartCN.VISUAL_ID:

-			return getConstraintName_5064Parser();

-		case ConstraintBodyEditPartCN.VISUAL_ID:

-			return getConstraintSpecification_5160Parser();

-		case NestedInterfaceForClassEditPart.VISUAL_ID:

-			return getInterface_3036Parser();

-		case NestedInterfaceForComponentEditPart.VISUAL_ID:

-			return getInterface_3037Parser();

-		case NestedInterfaceForInterfaceEditPart.VISUAL_ID:

-			return getInterface_3038Parser();

-		case NestedEnumerationForClassEditPart.VISUAL_ID:

-			return getEnumeration_3052Parser();

-		case NestedEnumerationForComponentEditPart.VISUAL_ID:

-			return getEnumeration_3053Parser();

-		case NestedEnumerationForInterfaceEditPart.VISUAL_ID:

-			return getEnumeration_3054Parser();

-		case NestedPrimitiveTypeForClassEditPart.VISUAL_ID:

-			return getPrimitiveType_3047Parser();

-		case NestedPrimitiveTypeForComponentEditPart.VISUAL_ID:

-			return getPrimitiveType_3046Parser();

-		case NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID:

-			return getPrimitiveType_3048Parser();

-		case NestedDataTypeForClassEditPart.VISUAL_ID:

-			return getDataType_3044Parser();

-		case NestedDataTypeForComponentEditPart.VISUAL_ID:

-			return getDataType_3045Parser();

-		case NestedDataTypeForInterfaceEditPart.VISUAL_ID:

-			return getDataType_3043Parser();

-		case NestedSignalForClassEditPart.VISUAL_ID:

-			return getSignal_3050Parser();

-		case NestedSignalForComponentEditPart.VISUAL_ID:

-			return getSignal_3051Parser();

-		case NestedSignalForInterfaceEditPart.VISUAL_ID:

-			return getSignal_3049Parser();

-		case AssociationClassRoleSourceEditPart.VISUAL_ID:

-			return getAssociationClassName_6031Parser();

-		case AssociationClassRoleTargetEditPart.VISUAL_ID:

-			return getAssociationClassName_6032Parser();

-		case AppliedStereotypeAssociationEditPart.VISUAL_ID:

-			return getAssociationName_6001Parser();

-		case AssociationNameEditPart.VISUAL_ID:

-			return getAssociationName_6002Parser();

-		case AssociationTargetNameEditPart.VISUAL_ID:

-			return getAssociationName_6003Parser();

-		case AssociationSourceNameEditPart.VISUAL_ID:

-			return getAssociationName_6005Parser();

-		case AssociationMultiplicitySourceEditPart.VISUAL_ID:

-			return getAssociationName_6033Parser();

-		case AssociationMultiplicityTargetEditPart.VISUAL_ID:

-			return getAssociationName_6034Parser();

-		case AssociationBranchMutliplicityEditPart.VISUAL_ID:

-			return getAssociationName_6035Parser();

-		case AppliedStereotyperGeneralizationEditPart.VISUAL_ID:

-			return getGeneralizationIsSubstitutable_6007Parser();

-		case AppliedStereotypeInterfaceRealizationEditPart.VISUAL_ID:

-			return getInterfaceRealizationName_6008Parser();

-		case InterfaceRealizationNameEditPart.VISUAL_ID:

-			return getInterfaceRealizationName_6009Parser();

-		case AppliedStereotypeSubstitutionEditPart.VISUAL_ID:

-			return getSubstitutionName_6010Parser();

-		case SubstitutionNameEditPart.VISUAL_ID:

-			return getSubstitutionName_6011Parser();

-		case AppliedStereotypeRealizationEditPart.VISUAL_ID:

-			return getRealizationName_6012Parser();

-		case RealizationNameEditPart.VISUAL_ID:

-			return getRealizationName_6013Parser();

-		case AbstractionNameEditPart.VISUAL_ID:

-			return getAbstractionName_6014Parser();

-		case AppliedStereotypeAbstractionEditPart.VISUAL_ID:

-			return getAbstractionName_6015Parser();

-		case UsageNameEditPart.VISUAL_ID:

-			return getUsageName_6016Parser();

-		case AppliedStereotypeUsageEditPart.VISUAL_ID:

-			return getUsageName_6017Parser();

-		case DependencyNameEditPart.VISUAL_ID:

-			return getDependencyName_6026Parser();

-		case AppliedStereotypeDependencyEditPart.VISUAL_ID:

-			return getDependencyName_6027Parser();

-		case ElementImportAliasEditPart.VISUAL_ID:

-			return getElementImportAlias_6020Parser();

-		case AppliedStereotypeElementImportEditPart.VISUAL_ID:

-			return getElementImportAlias_6021Parser();

-		case AppliedStereotypePackageImportEditPart.VISUAL_ID:

-			return getPackageImportVisibility_6022Parser();

-		case AppliedStereotypePackageMergeEditPart.VISUAL_ID:

-			return getPackageMergeLabel_6030Parser();

-		case BindingSubstitutionEditPart.VISUAL_ID:

-			return getTemplateBindingLabel_6023Parser();

-		case AppliedStereotypeTemplateBindingEditPart.VISUAL_ID:

-			return getTemplateBindingLabel_6036Parser();

-		case ConstraintLabelEditPart.VISUAL_ID:

-			return getGeneralizationSetIsCoveringIsDisjoint_5067Parser();

-		case AppliedStereotypeGeneralizationSetLabelEditPart.VISUAL_ID:

-			return getGeneralizationSetLabel_6037Parser();

-		case SourceISLinkLabelEditPart.VISUAL_ID:

-			return getInstanceSpecificationLabel_6039Parser();

-		case TargetISLinkLabelEditPart.VISUAL_ID:

-			return getInstanceSpecificationLabel_6038Parser();

-		case InformationFlowAppliedStereotypeEditPart.VISUAL_ID:

-			return getInformationFlowName_6041Parser();

-		}

-		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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationDecoratorProvider.java
deleted file mode 100644
index a0845fa94d4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationDecoratorProvider.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditor;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider;

-

-/**

- * @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 && ModelEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view));

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationProvider.java
deleted file mode 100644
index 384db2467a3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationProvider.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.providers;

-

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.clazz.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 && ModelEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID((View) object));

-		}

-		return true;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java
deleted file mode 100644
index fa880da849b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java
+++ /dev/null
@@ -1,2870 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.providers;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-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.clazz.edit.parts.*;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-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 ModelEditPart.MODEL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean provides(CreateDiagramViewOperation op) {

-		return ModelEditPart.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) {

-					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

-					}

-				}

-				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 (!ModelEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(op.getContainerView()))) {

-					return false; // foreign diagram

-				}

-				switch (visualID) {

-				case ContainmentCircleEditPart.VISUAL_ID:

-					break; // pure design element

-				case DependencyNodeEditPart.VISUAL_ID:

-				case AssociationClassEditPart.VISUAL_ID:

-				case AssociationNodeEditPart.VISUAL_ID:

-				case InstanceSpecificationEditPart.VISUAL_ID:

-				case ComponentEditPart.VISUAL_ID:

-				case SignalEditPart.VISUAL_ID:

-				case InterfaceEditPart.VISUAL_ID:

-				case ModelEditPartTN.VISUAL_ID:

-				case InformationItemEditPart.VISUAL_ID:

-				case ShortCutDiagramEditPart.VISUAL_ID:

-				case DurationObservationEditPart.VISUAL_ID:

-				case TimeObservationEditPart.VISUAL_ID:

-				case DefaultNamedElementEditPart.VISUAL_ID:

-				case PropertyForComponentEditPart.VISUAL_ID:

-				case NestedClassForComponentEditPart.VISUAL_ID:

-				case OperationForComponentEditPart.VISUAL_ID:

-				case ConnectableElementTemplateParameterEditPart.VISUAL_ID:

-				case OperationTemplateParameterEditPart.VISUAL_ID:

-				case ClassifierTemplateParameterEditPart.VISUAL_ID:

-				case TemplateParameterEditPart.VISUAL_ID:

-				case EnumerationLiteralEditPart.VISUAL_ID:

-				case ReceptionEditPart.VISUAL_ID:

-				case ReceptionInInterfaceEditPart.VISUAL_ID:

-				case SlotEditPart.VISUAL_ID:

-				case RedefinableTemplateSignatureEditPart.VISUAL_ID:

-				case TemplateSignatureEditPart.VISUAL_ID:

-				case EnumerationEditPartCN.VISUAL_ID:

-				case InformationItemEditPartCN.VISUAL_ID:

-				case PrimitiveTypeEditPartCN.VISUAL_ID:

-				case DataTypeEditPartCN.VISUAL_ID:

-				case CommentEditPartCN.VISUAL_ID:

-				case ConstraintEditPartCN.VISUAL_ID:

-				case NestedInterfaceForComponentEditPart.VISUAL_ID:

-				case EnumerationEditPart.VISUAL_ID:

-				case PackageEditPart.VISUAL_ID:

-				case ClassEditPart.VISUAL_ID:

-				case PrimitiveTypeEditPart.VISUAL_ID:

-				case DataTypeEditPart.VISUAL_ID:

-				case ConstraintEditPart.VISUAL_ID:

-				case CommentEditPart.VISUAL_ID:

-				case PropertyForClassEditPart.VISUAL_ID:

-				case PropertyForSignalEditPart.VISUAL_ID:

-				case PropertyForInterfaceEditPart.VISUAL_ID:

-				case PropertyforPrimitiveTypeEditPart.VISUAL_ID:

-				case PropertyforDataTypeEditPart.VISUAL_ID:

-				case NestedClassForClassEditPart.VISUAL_ID:

-				case NestedClassForInterfaceEditPart.VISUAL_ID:

-				case OperationForClassEditPart.VISUAL_ID:

-				case OperationForInterfaceEditpart.VISUAL_ID:

-				case OperationForPrimitiveTypeEditPart.VISUAL_ID:

-				case OperationForDataTypeEditPart.VISUAL_ID:

-				case InstanceSpecificationEditPartCN.VISUAL_ID:

-				case ComponentEditPartCN.VISUAL_ID:

-				case SignalEditPartCN.VISUAL_ID:

-				case InterfaceEditPartCN.VISUAL_ID:

-				case ModelEditPartCN.VISUAL_ID:

-				case PackageEditPartCN.VISUAL_ID:

-				case ClassEditPartCN.VISUAL_ID:

-				case NestedInterfaceForClassEditPart.VISUAL_ID:

-				case NestedInterfaceForInterfaceEditPart.VISUAL_ID:

-				case NestedEnumerationForClassEditPart.VISUAL_ID:

-				case NestedEnumerationForComponentEditPart.VISUAL_ID:

-				case NestedEnumerationForInterfaceEditPart.VISUAL_ID:

-				case NestedPrimitiveTypeForClassEditPart.VISUAL_ID:

-				case NestedPrimitiveTypeForComponentEditPart.VISUAL_ID:

-				case NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID:

-				case NestedDataTypeForClassEditPart.VISUAL_ID:

-				case NestedDataTypeForComponentEditPart.VISUAL_ID:

-				case NestedDataTypeForInterfaceEditPart.VISUAL_ID:

-				case NestedSignalForClassEditPart.VISUAL_ID:

-				case NestedSignalForComponentEditPart.VISUAL_ID:

-				case NestedSignalForInterfaceEditPart.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 DependencyNodeEditPart.VISUAL_ID == visualID || AssociationClassEditPart.VISUAL_ID == visualID || AssociationNodeEditPart.VISUAL_ID == visualID || InstanceSpecificationEditPart.VISUAL_ID == visualID || ComponentEditPart.VISUAL_ID == visualID

-				|| SignalEditPart.VISUAL_ID == visualID || InterfaceEditPart.VISUAL_ID == visualID || ModelEditPartTN.VISUAL_ID == visualID || EnumerationEditPart.VISUAL_ID == visualID || PackageEditPart.VISUAL_ID == visualID

-				|| InformationItemEditPart.VISUAL_ID == visualID || ClassEditPart.VISUAL_ID == visualID || PrimitiveTypeEditPart.VISUAL_ID == visualID || DataTypeEditPart.VISUAL_ID == visualID || ConstraintEditPart.VISUAL_ID == visualID

-				|| CommentEditPart.VISUAL_ID == visualID || ShortCutDiagramEditPart.VISUAL_ID == visualID || DurationObservationEditPart.VISUAL_ID == visualID || TimeObservationEditPart.VISUAL_ID == visualID

-				|| DefaultNamedElementEditPart.VISUAL_ID == visualID || PropertyForClassEditPart.VISUAL_ID == visualID || PropertyForComponentEditPart.VISUAL_ID == visualID || PropertyForSignalEditPart.VISUAL_ID == visualID

-				|| PropertyForInterfaceEditPart.VISUAL_ID == visualID || PropertyforPrimitiveTypeEditPart.VISUAL_ID == visualID || PropertyforDataTypeEditPart.VISUAL_ID == visualID || NestedClassForClassEditPart.VISUAL_ID == visualID

-				|| NestedClassForComponentEditPart.VISUAL_ID == visualID || NestedClassForInterfaceEditPart.VISUAL_ID == visualID || OperationForClassEditPart.VISUAL_ID == visualID || OperationForComponentEditPart.VISUAL_ID == visualID

-				|| OperationForInterfaceEditpart.VISUAL_ID == visualID || OperationForPrimitiveTypeEditPart.VISUAL_ID == visualID || OperationForDataTypeEditPart.VISUAL_ID == visualID || ConnectableElementTemplateParameterEditPart.VISUAL_ID == visualID

-				|| OperationTemplateParameterEditPart.VISUAL_ID == visualID || ClassifierTemplateParameterEditPart.VISUAL_ID == visualID || TemplateParameterEditPart.VISUAL_ID == visualID || EnumerationLiteralEditPart.VISUAL_ID == visualID

-				|| ReceptionEditPart.VISUAL_ID == visualID || ReceptionInInterfaceEditPart.VISUAL_ID == visualID || SlotEditPart.VISUAL_ID == visualID || RedefinableTemplateSignatureEditPart.VISUAL_ID == visualID

-				|| ContainmentCircleEditPart.VISUAL_ID == visualID || TemplateSignatureEditPart.VISUAL_ID == visualID || InstanceSpecificationEditPartCN.VISUAL_ID == visualID || ComponentEditPartCN.VISUAL_ID == visualID

-				|| SignalEditPartCN.VISUAL_ID == visualID || InterfaceEditPartCN.VISUAL_ID == visualID || ModelEditPartCN.VISUAL_ID == visualID || EnumerationEditPartCN.VISUAL_ID == visualID || PackageEditPartCN.VISUAL_ID == visualID

-				|| InformationItemEditPartCN.VISUAL_ID == visualID || ClassEditPartCN.VISUAL_ID == visualID || PrimitiveTypeEditPartCN.VISUAL_ID == visualID || DataTypeEditPartCN.VISUAL_ID == visualID || CommentEditPartCN.VISUAL_ID == visualID

-				|| ConstraintEditPartCN.VISUAL_ID == visualID || NestedInterfaceForClassEditPart.VISUAL_ID == visualID || NestedInterfaceForComponentEditPart.VISUAL_ID == visualID || NestedInterfaceForInterfaceEditPart.VISUAL_ID == visualID

-				|| NestedEnumerationForClassEditPart.VISUAL_ID == visualID || NestedEnumerationForComponentEditPart.VISUAL_ID == visualID || NestedEnumerationForInterfaceEditPart.VISUAL_ID == visualID

-				|| NestedPrimitiveTypeForClassEditPart.VISUAL_ID == visualID || NestedPrimitiveTypeForComponentEditPart.VISUAL_ID == visualID || NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID == visualID

-				|| NestedDataTypeForClassEditPart.VISUAL_ID == visualID || NestedDataTypeForComponentEditPart.VISUAL_ID == visualID || NestedDataTypeForInterfaceEditPart.VISUAL_ID == visualID || NestedSignalForClassEditPart.VISUAL_ID == visualID

-				|| NestedSignalForComponentEditPart.VISUAL_ID == visualID || NestedSignalForInterfaceEditPart.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.clazz.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(ModelEditPart.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 DependencyNodeEditPart.VISUAL_ID:

-			return createDependency_2014(domainElement, containerView, index, persisted, preferencesHint);

-		case AssociationClassEditPart.VISUAL_ID:

-			return createAssociationClass_2013(domainElement, containerView, index, persisted, preferencesHint);

-		case AssociationNodeEditPart.VISUAL_ID:

-			return createAssociation_2015(domainElement, containerView, index, persisted, preferencesHint);

-		case InstanceSpecificationEditPart.VISUAL_ID:

-			return createInstanceSpecification_2001(domainElement, containerView, index, persisted, preferencesHint);

-		case ComponentEditPart.VISUAL_ID:

-			return createComponent_2002(domainElement, containerView, index, persisted, preferencesHint);

-		case SignalEditPart.VISUAL_ID:

-			return createSignal_2003(domainElement, containerView, index, persisted, preferencesHint);

-		case InterfaceEditPart.VISUAL_ID:

-			return createInterface_2004(domainElement, containerView, index, persisted, preferencesHint);

-		case ModelEditPartTN.VISUAL_ID:

-			return createModel_2005(domainElement, containerView, index, persisted, preferencesHint);

-		case EnumerationEditPart.VISUAL_ID:

-			return createEnumeration_2006(domainElement, containerView, index, persisted, preferencesHint);

-		case PackageEditPart.VISUAL_ID:

-			return createPackage_2007(domainElement, containerView, index, persisted, preferencesHint);

-		case InformationItemEditPart.VISUAL_ID:

-			return createInformationItem_2099(domainElement, containerView, index, persisted, preferencesHint);

-		case ClassEditPart.VISUAL_ID:

-			return createClass_2008(domainElement, containerView, index, persisted, preferencesHint);

-		case PrimitiveTypeEditPart.VISUAL_ID:

-			return createPrimitiveType_2009(domainElement, containerView, index, persisted, preferencesHint);

-		case DataTypeEditPart.VISUAL_ID:

-			return createDataType_2010(domainElement, containerView, index, persisted, preferencesHint);

-		case ConstraintEditPart.VISUAL_ID:

-			return createConstraint_2011(domainElement, containerView, index, persisted, preferencesHint);

-		case CommentEditPart.VISUAL_ID:

-			return createComment_2012(domainElement, containerView, index, persisted, preferencesHint);

-		case ShortCutDiagramEditPart.VISUAL_ID:

-			return createDiagram_2016(domainElement, containerView, index, persisted, preferencesHint);

-		case DurationObservationEditPart.VISUAL_ID:

-			return createDurationObservation_2095(domainElement, containerView, index, persisted, preferencesHint);

-		case TimeObservationEditPart.VISUAL_ID:

-			return createTimeObservation_2096(domainElement, containerView, index, persisted, preferencesHint);

-		case DefaultNamedElementEditPart.VISUAL_ID:

-			return createNamedElement_2097(domainElement, containerView, index, persisted, preferencesHint);

-		case PropertyForClassEditPart.VISUAL_ID:

-			return createProperty_3012(domainElement, containerView, index, persisted, preferencesHint);

-		case PropertyForComponentEditPart.VISUAL_ID:

-			return createProperty_3002(domainElement, containerView, index, persisted, preferencesHint);

-		case PropertyForSignalEditPart.VISUAL_ID:

-			return createProperty_3005(domainElement, containerView, index, persisted, preferencesHint);

-		case PropertyForInterfaceEditPart.VISUAL_ID:

-			return createProperty_3006(domainElement, containerView, index, persisted, preferencesHint);

-		case PropertyforPrimitiveTypeEditPart.VISUAL_ID:

-			return createProperty_3041(domainElement, containerView, index, persisted, preferencesHint);

-		case PropertyforDataTypeEditPart.VISUAL_ID:

-			return createProperty_3018(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedClassForClassEditPart.VISUAL_ID:

-			return createClass_3014(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedClassForComponentEditPart.VISUAL_ID:

-			return createClass_3004(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedClassForInterfaceEditPart.VISUAL_ID:

-			return createClass_3008(domainElement, containerView, index, persisted, preferencesHint);

-		case OperationForClassEditPart.VISUAL_ID:

-			return createOperation_3013(domainElement, containerView, index, persisted, preferencesHint);

-		case OperationForComponentEditPart.VISUAL_ID:

-			return createOperation_3003(domainElement, containerView, index, persisted, preferencesHint);

-		case OperationForInterfaceEditpart.VISUAL_ID:

-			return createOperation_3007(domainElement, containerView, index, persisted, preferencesHint);

-		case OperationForPrimitiveTypeEditPart.VISUAL_ID:

-			return createOperation_3042(domainElement, containerView, index, persisted, preferencesHint);

-		case OperationForDataTypeEditPart.VISUAL_ID:

-			return createOperation_3019(domainElement, containerView, index, persisted, preferencesHint);

-		case ConnectableElementTemplateParameterEditPart.VISUAL_ID:

-			return createConnectableElementTemplateParameter_3034(domainElement, containerView, index, persisted, preferencesHint);

-		case OperationTemplateParameterEditPart.VISUAL_ID:

-			return createOperationTemplateParameter_3035(domainElement, containerView, index, persisted, preferencesHint);

-		case ClassifierTemplateParameterEditPart.VISUAL_ID:

-			return createClassifierTemplateParameter_3031(domainElement, containerView, index, persisted, preferencesHint);

-		case TemplateParameterEditPart.VISUAL_ID:

-			return createTemplateParameter_3016(domainElement, containerView, index, persisted, preferencesHint);

-		case EnumerationLiteralEditPart.VISUAL_ID:

-			return createEnumerationLiteral_3017(domainElement, containerView, index, persisted, preferencesHint);

-		case ReceptionEditPart.VISUAL_ID:

-			return createReception_3011(domainElement, containerView, index, persisted, preferencesHint);

-		case ReceptionInInterfaceEditPart.VISUAL_ID:

-			return createReception_3039(domainElement, containerView, index, persisted, preferencesHint);

-		case SlotEditPart.VISUAL_ID:

-			return createSlot_3030(domainElement, containerView, index, persisted, preferencesHint);

-		case RedefinableTemplateSignatureEditPart.VISUAL_ID:

-			return createRedefinableTemplateSignature_3015(domainElement, containerView, index, persisted, preferencesHint);

-		case ContainmentCircleEditPart.VISUAL_ID:

-			return createNode_3032(domainElement, containerView, index, persisted, preferencesHint);

-		case TemplateSignatureEditPart.VISUAL_ID:

-			return createTemplateSignature_3033(domainElement, containerView, index, persisted, preferencesHint);

-		case InstanceSpecificationEditPartCN.VISUAL_ID:

-			return createInstanceSpecification_3020(domainElement, containerView, index, persisted, preferencesHint);

-		case ComponentEditPartCN.VISUAL_ID:

-			return createComponent_3021(domainElement, containerView, index, persisted, preferencesHint);

-		case SignalEditPartCN.VISUAL_ID:

-			return createSignal_3022(domainElement, containerView, index, persisted, preferencesHint);

-		case InterfaceEditPartCN.VISUAL_ID:

-			return createInterface_3023(domainElement, containerView, index, persisted, preferencesHint);

-		case ModelEditPartCN.VISUAL_ID:

-			return createModel_3024(domainElement, containerView, index, persisted, preferencesHint);

-		case EnumerationEditPartCN.VISUAL_ID:

-			return createEnumeration_3025(domainElement, containerView, index, persisted, preferencesHint);

-		case PackageEditPartCN.VISUAL_ID:

-			return createPackage_3009(domainElement, containerView, index, persisted, preferencesHint);

-		case InformationItemEditPartCN.VISUAL_ID:

-			return createInformationItem_3040(domainElement, containerView, index, persisted, preferencesHint);

-		case ClassEditPartCN.VISUAL_ID:

-			return createClass_3010(domainElement, containerView, index, persisted, preferencesHint);

-		case PrimitiveTypeEditPartCN.VISUAL_ID:

-			return createPrimitiveType_3026(domainElement, containerView, index, persisted, preferencesHint);

-		case DataTypeEditPartCN.VISUAL_ID:

-			return createDataType_3027(domainElement, containerView, index, persisted, preferencesHint);

-		case CommentEditPartCN.VISUAL_ID:

-			return createComment_3028(domainElement, containerView, index, persisted, preferencesHint);

-		case ConstraintEditPartCN.VISUAL_ID:

-			return createConstraint_3029(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedInterfaceForClassEditPart.VISUAL_ID:

-			return createInterface_3036(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedInterfaceForComponentEditPart.VISUAL_ID:

-			return createInterface_3037(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedInterfaceForInterfaceEditPart.VISUAL_ID:

-			return createInterface_3038(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedEnumerationForClassEditPart.VISUAL_ID:

-			return createEnumeration_3052(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedEnumerationForComponentEditPart.VISUAL_ID:

-			return createEnumeration_3053(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedEnumerationForInterfaceEditPart.VISUAL_ID:

-			return createEnumeration_3054(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedPrimitiveTypeForClassEditPart.VISUAL_ID:

-			return createPrimitiveType_3047(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedPrimitiveTypeForComponentEditPart.VISUAL_ID:

-			return createPrimitiveType_3046(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID:

-			return createPrimitiveType_3048(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedDataTypeForClassEditPart.VISUAL_ID:

-			return createDataType_3044(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedDataTypeForComponentEditPart.VISUAL_ID:

-			return createDataType_3045(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedDataTypeForInterfaceEditPart.VISUAL_ID:

-			return createDataType_3043(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedSignalForClassEditPart.VISUAL_ID:

-			return createSignal_3050(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedSignalForComponentEditPart.VISUAL_ID:

-			return createSignal_3051(domainElement, containerView, index, persisted, preferencesHint);

-		case NestedSignalForInterfaceEditPart.VISUAL_ID:

-			return createSignal_3049(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 AssociationClassDashedLinkEditPart.VISUAL_ID:

-			return createLink_4016(containerView, index, persisted, preferencesHint);

-		case AssociationClassLinkEditPart.VISUAL_ID:

-			return createAssociationClass_4017(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case AssociationEditPart.VISUAL_ID:

-			return createAssociation_4001(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case AssociationBranchEditPart.VISUAL_ID:

-			return createAssociation_4019(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case GeneralizationEditPart.VISUAL_ID:

-			return createGeneralization_4002(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case InterfaceRealizationEditPart.VISUAL_ID:

-			return createInterfaceRealization_4003(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case SubstitutionEditPart.VISUAL_ID:

-			return createSubstitution_4004(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case RealizationEditPart.VISUAL_ID:

-			return createRealization_4005(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case AbstractionEditPart.VISUAL_ID:

-			return createAbstraction_4006(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case UsageEditPart.VISUAL_ID:

-			return createUsage_4007(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case DependencyEditPart.VISUAL_ID:

-			return createDependency_4008(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case DependencyBranchEditPart.VISUAL_ID:

-			return createDependency_4018(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case ElementImportEditPart.VISUAL_ID:

-			return createElementImport_4009(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case PackageImportEditPart.VISUAL_ID:

-			return createPackageImport_4010(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case PackageMergeEditPart.VISUAL_ID:

-			return createPackageMerge_4011(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case ProfileApplicationEditPart.VISUAL_ID:

-			return createProfileApplication_4012(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return createCommentAnnotatedElement_4013(containerView, index, persisted, preferencesHint);

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return createConstraintConstrainedElement_4014(containerView, index, persisted, preferencesHint);

-		case TemplateBindingEditPart.VISUAL_ID:

-			return createTemplateBinding_4015(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case GeneralizationSetEditPart.VISUAL_ID:

-			return createGeneralizationSet_4020(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case InstanceSpecificationLinkEditPart.VISUAL_ID:

-			return createInstanceSpecification_4021(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case ContainmentSubLinkEditPart.VISUAL_ID:

-			return createLink_4022(containerView, index, persisted, preferencesHint);

-		case ContainmentLinkEditPart.VISUAL_ID:

-			return createLink_4023(containerView, index, persisted, preferencesHint);

-		case ConnectorTimeObservationEditPart.VISUAL_ID:

-			return createTimeObservationEvent_4024(containerView, index, persisted, preferencesHint);

-		case ConnectorDurationObservationEditPart.VISUAL_ID:

-			return createDurationObservationEvent_4025(containerView, index, persisted, preferencesHint);

-		case InformationFlowEditPart.VISUAL_ID:

-			return createInformationFlow_4026(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

-		case ContextLinkEditPart.VISUAL_ID:

-			return createConstraintContext_8500(containerView, index, persisted, preferencesHint);

-		}

-		// can never happen, provided #provides(CreateEdgeViewOperation) is correct

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createDependency_2014(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(DependencyNodeEditPart.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, "DependencyNode");

-		Node label1 = createLabel(node, UMLVisualIDRegistry.getType(MultiDependencyLabelEditPart.VISUAL_ID));

-		label1.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location1 = (Location) label1.getLayoutConstraint();

-		location1.setX(0);

-		location1.setY(5);

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createAssociationClass_2013(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(AssociationClassEditPart.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, "AssociationClass");

-		Node label5066 = createLabel(node, UMLVisualIDRegistry.getType(AssociationClassNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(AssociationClassAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(AssociationClassOperationCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(AssociationClassNestedClassifierCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "AssociationClass");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createAssociation_2015(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(AssociationNodeEditPart.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, "AssociationNode");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createInstanceSpecification_2001(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(InstanceSpecificationEditPart.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, "InstanceSpecification");

-		Node label5002 = createLabel(node, UMLVisualIDRegistry.getType(InstanceSpecificationNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "InstanceSpecification");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createComponent_2002(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ComponentEditPart.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 label5005 = createLabel(node, UMLVisualIDRegistry.getType(ComponentNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(ComponentAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createSignal_2003(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 label5008 = createLabel(node, UMLVisualIDRegistry.getType(SignalNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(SignalAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Signal");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createInterface_2004(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 label5011 = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Interface");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createModel_2005(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ModelEditPartTN.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, "Model");

-		Node label5020 = createLabel(node, UMLVisualIDRegistry.getType(ModelNameEditPartTN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(ModelPackageableElementCompartmentEditPartTN.VISUAL_ID), false, true, false, false);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Model");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createEnumeration_2006(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 label5023 = 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 createPackage_2007(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(PackageEditPart.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, "Package");

-		Node label5026 = createLabel(node, UMLVisualIDRegistry.getType(PackageNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartmentEditPart.VISUAL_ID), false, true, false, false);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Package");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createInformationItem_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(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 label5161 = createLabel(node, UMLVisualIDRegistry.getType(InformationItemNameEditPart.VISUAL_ID));

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createClass_2008(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ClassEditPart.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 label5029 = createLabel(node, UMLVisualIDRegistry.getType(ClassNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createPrimitiveType_2009(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 label5032 = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "PrimitiveType");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createDataType_2010(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 label5035 = 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 createConstraint_2011(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(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 label5037 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID));

-		Node label5159 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintBodyEditPart.VISUAL_ID));

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createComment_2012(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(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 label5038 = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID));

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createDiagram_2016(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ShortCutDiagramEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-		stampShortcut(containerView, node);

-		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ShortCutDiagram");

-		Node label0 = createLabel(node, UMLVisualIDRegistry.getType(DiagramNameEditPart.VISUAL_ID));

-		label0.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location0 = (Location) label0.getLayoutConstraint();

-		location0.setX(0);

-		location0.setY(5);

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createDurationObservation_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(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 label5155 = createLabel(node, UMLVisualIDRegistry.getType(DurationObservationNameEditPart.VISUAL_ID));

-		label5155.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location5155 = (Location) label5155.getLayoutConstraint();

-		location5155.setX(25);

-		location5155.setY(3);

-		Node label5156 = createLabel(node, UMLVisualIDRegistry.getType(DurationObservationStereotypeLabelEditPart.VISUAL_ID));

-		label5156.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location5156 = (Location) label5156.getLayoutConstraint();

-		location5156.setX(25);

-		location5156.setY(-10);

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createTimeObservation_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(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 label5153 = createLabel(node, UMLVisualIDRegistry.getType(TimeObservationNameEditPart.VISUAL_ID));

-		label5153.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location5153 = (Location) label5153.getLayoutConstraint();

-		location5153.setX(25);

-		location5153.setY(3);

-		Node label5154 = createLabel(node, UMLVisualIDRegistry.getType(TimeObservationStereotypeLabelEditPart.VISUAL_ID));

-		label5154.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location5154 = (Location) label5154.getLayoutConstraint();

-		location5154.setX(25);

-		location5154.setY(-10);

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createNamedElement_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(DefaultNamedElementEditPart.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, "DefaultNamedElement");

-		Node label5157 = createLabel(node, UMLVisualIDRegistry.getType(DefaultNamedElementNameEditPart.VISUAL_ID));

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createProperty_3012(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(PropertyForClassEditPart.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 createProperty_3002(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(PropertyForComponentEditPart.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 createProperty_3005(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(PropertyForSignalEditPart.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 createProperty_3006(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(PropertyForInterfaceEditPart.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 createProperty_3041(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(PropertyforPrimitiveTypeEditPart.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 createProperty_3018(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(PropertyforDataTypeEditPart.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 createClass_3014(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedClassForClassEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createClass_3004(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedClassForComponentEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createClass_3008(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedClassForInterfaceEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createOperation_3013(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(OperationForClassEditPart.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 createOperation_3003(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(OperationForComponentEditPart.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 createOperation_3007(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(OperationForInterfaceEditpart.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 createOperation_3042(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(OperationForPrimitiveTypeEditPart.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 createOperation_3019(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(OperationForDataTypeEditPart.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 createConnectableElementTemplateParameter_3034(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(ConnectableElementTemplateParameterEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ConnectableElementTemplateParameter");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createOperationTemplateParameter_3035(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(OperationTemplateParameterEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "OperationTemplateParameter");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createClassifierTemplateParameter_3031(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(ClassifierTemplateParameterEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ClassifierTemplateParameter");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createTemplateParameter_3016(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(TemplateParameterEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TemplateParameter");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createEnumerationLiteral_3017(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(EnumerationLiteralEditPart.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 Node createReception_3011(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(ReceptionEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Reception");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createReception_3039(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(ReceptionInInterfaceEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Reception");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createSlot_3030(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(SlotEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Slot");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createRedefinableTemplateSignature_3015(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(RedefinableTemplateSignatureEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "RedefinableTemplateSignature");

-		createCompartment(node, UMLVisualIDRegistry.getType(RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID), false, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "RedefinableTemplateSignature");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createNode_3032(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ContainmentCircleEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ContainmentCircle");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createTemplateSignature_3033(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(TemplateSignatureEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TemplateSignature");

-		createCompartment(node, UMLVisualIDRegistry.getType(TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID), false, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "TemplateSignature");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createInstanceSpecification_3020(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(InstanceSpecificationEditPartCN.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InstanceSpecification");

-		Node label5040 = createLabel(node, UMLVisualIDRegistry.getType(InstanceSpecificationNameEditPartCN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "InstanceSpecification");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createComponent_3021(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ComponentEditPartCN.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component");

-		Node label5043 = createLabel(node, UMLVisualIDRegistry.getType(ComponentNameEditPartCN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(ComponentAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createSignal_3022(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 label5046 = createLabel(node, UMLVisualIDRegistry.getType(SignalNameEditPartCN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(SignalAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Signal");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createInterface_3023(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 label5049 = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPartCN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Interface");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createModel_3024(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ModelEditPartCN.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Model");

-		Node label5052 = createLabel(node, UMLVisualIDRegistry.getType(ModelNameEditPartCN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(ModelPackageableElementCompartmentEditPartCN.VISUAL_ID), false, true, false, false);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Model");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createEnumeration_3025(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 label5055 = 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 createPackage_3009(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(PackageEditPartCN.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Package");

-		Node label5017 = createLabel(node, UMLVisualIDRegistry.getType(PackageNameEditPartCN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartmentEditPartCN.VISUAL_ID), false, true, false, false);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Package");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createInformationItem_3040(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 label5162 = createLabel(node, UMLVisualIDRegistry.getType(InformationItemNameEditPartCN.VISUAL_ID));

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createClass_3010(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Shape node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(UMLVisualIDRegistry.getType(ClassEditPartCN.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-		// initializeFromPreferences 

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");

-		Node label5014 = createLabel(node, UMLVisualIDRegistry.getType(ClassNameEditPartCN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createPrimitiveType_3026(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 label5058 = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID));

-		createCompartment(node, UMLVisualIDRegistry.getType(PrimitiveTypeAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(PrimitiveTypeOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "PrimitiveType");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createDataType_3027(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 label5061 = 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 createComment_3028(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 label5063 = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPartCN.VISUAL_ID));

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createConstraint_3029(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 label5064 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID));

-		Node label5160 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintBodyEditPartCN.VISUAL_ID));

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createInterface_3036(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedInterfaceForClassEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createInterface_3037(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedInterfaceForComponentEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createInterface_3038(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedInterfaceForInterfaceEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createEnumeration_3052(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedEnumerationForClassEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Enumeration");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createEnumeration_3053(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedEnumerationForComponentEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Enumeration");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createEnumeration_3054(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedEnumerationForInterfaceEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Enumeration");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createPrimitiveType_3047(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedPrimitiveTypeForClassEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "PrimitiveType");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createPrimitiveType_3046(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedPrimitiveTypeForComponentEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "PrimitiveType");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createPrimitiveType_3048(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "PrimitiveType");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createDataType_3044(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedDataTypeForClassEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DataType");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createDataType_3045(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedDataTypeForComponentEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DataType");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createDataType_3043(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedDataTypeForInterfaceEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DataType");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createSignal_3050(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedSignalForClassEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Signal");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createSignal_3051(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedSignalForComponentEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Signal");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Node createSignal_3049(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Node node = NotationFactory.eINSTANCE.createNode();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		node.setType(UMLVisualIDRegistry.getType(NestedSignalForInterfaceEditPart.VISUAL_ID));

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Signal");

-		return node;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createLink_4016(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(AssociationClassDashedLinkEditPart.VISUAL_ID));

-		edge.setElement(null);

-		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "AssociationClassDashedLink");

-		//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 createAssociationClass_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(AssociationClassLinkEditPart.VISUAL_ID));

-		edge.setElement(domainElement);

-		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "AssociationClassLink");

-		//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(AssociationClassRoleSourceEditPart.VISUAL_ID));

-		label6031.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6031 = (Location) label6031.getLayoutConstraint();

-		location6031.setX(0);

-		location6031.setY(-20);

-		Node label6032 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationClassRoleTargetEditPart.VISUAL_ID));

-		label6032.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6032 = (Location) label6032.getLayoutConstraint();

-		location6032.setX(0);

-		location6032.setY(20);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createAssociation_4001(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(AssociationEditPart.VISUAL_ID));

-		edge.setElement(domainElement);

-		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "AssociationLink");

-		//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(AppliedStereotypeAssociationEditPart.VISUAL_ID));

-		label6001.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6001 = (Location) label6001.getLayoutConstraint();

-		location6001.setX(0);

-		location6001.setY(-20);

-		Node label6002 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationNameEditPart.VISUAL_ID));

-		label6002.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6002 = (Location) label6002.getLayoutConstraint();

-		location6002.setX(0);

-		location6002.setY(20);

-		Node label6003 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationTargetNameEditPart.VISUAL_ID));

-		label6003.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6003 = (Location) label6003.getLayoutConstraint();

-		location6003.setX(0);

-		location6003.setY(-20);

-		Node label6005 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationSourceNameEditPart.VISUAL_ID));

-		label6005.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6005 = (Location) label6005.getLayoutConstraint();

-		location6005.setX(0);

-		location6005.setY(20);

-		Node label6033 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationMultiplicitySourceEditPart.VISUAL_ID));

-		label6033.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6033 = (Location) label6033.getLayoutConstraint();

-		location6033.setX(0);

-		location6033.setY(20);

-		Node label6034 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationMultiplicityTargetEditPart.VISUAL_ID));

-		label6034.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6034 = (Location) label6034.getLayoutConstraint();

-		location6034.setX(0);

-		location6034.setY(-20);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createAssociation_4019(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Connector edge = NotationFactory.eINSTANCE.createConnector();

-		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

-		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		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(AssociationBranchEditPart.VISUAL_ID));

-		edge.setElement(domainElement);

-		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "AssociationBranchLink");

-		//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(AssociationBranchRoleEditPart.VISUAL_ID));

-		label6024.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6024 = (Location) label6024.getLayoutConstraint();

-		location6024.setX(0);

-		location6024.setY(-20);

-		Node label6035 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationBranchMutliplicityEditPart.VISUAL_ID));

-		label6035.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6035 = (Location) label6035.getLayoutConstraint();

-		location6035.setX(0);

-		location6035.setY(20);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createGeneralization_4002(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 label6007 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotyperGeneralizationEditPart.VISUAL_ID));

-		label6007.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6007 = (Location) label6007.getLayoutConstraint();

-		location6007.setX(0);

-		location6007.setY(40);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createInterfaceRealization_4003(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 label6008 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeInterfaceRealizationEditPart.VISUAL_ID));

-		label6008.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6008 = (Location) label6008.getLayoutConstraint();

-		location6008.setX(0);

-		location6008.setY(40);

-		Node label6009 = createLabel(edge, UMLVisualIDRegistry.getType(InterfaceRealizationNameEditPart.VISUAL_ID));

-		label6009.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6009 = (Location) label6009.getLayoutConstraint();

-		location6009.setX(0);

-		location6009.setY(60);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createSubstitution_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(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 label6010 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeSubstitutionEditPart.VISUAL_ID));

-		label6010.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6010 = (Location) label6010.getLayoutConstraint();

-		location6010.setX(0);

-		location6010.setY(40);

-		Node label6011 = createLabel(edge, UMLVisualIDRegistry.getType(SubstitutionNameEditPart.VISUAL_ID));

-		label6011.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6011 = (Location) label6011.getLayoutConstraint();

-		location6011.setX(0);

-		location6011.setY(60);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createRealization_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(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 label6012 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeRealizationEditPart.VISUAL_ID));

-		label6012.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6012 = (Location) label6012.getLayoutConstraint();

-		location6012.setX(0);

-		location6012.setY(40);

-		Node label6013 = createLabel(edge, UMLVisualIDRegistry.getType(RealizationNameEditPart.VISUAL_ID));

-		label6013.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6013 = (Location) label6013.getLayoutConstraint();

-		location6013.setX(0);

-		location6013.setY(60);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createAbstraction_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(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 label6014 = createLabel(edge, UMLVisualIDRegistry.getType(AbstractionNameEditPart.VISUAL_ID));

-		label6014.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6014 = (Location) label6014.getLayoutConstraint();

-		location6014.setX(0);

-		location6014.setY(40);

-		Node label6015 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeAbstractionEditPart.VISUAL_ID));

-		label6015.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6015 = (Location) label6015.getLayoutConstraint();

-		location6015.setX(0);

-		location6015.setY(60);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createUsage_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(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 label6016 = createLabel(edge, UMLVisualIDRegistry.getType(UsageNameEditPart.VISUAL_ID));

-		label6016.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6016 = (Location) label6016.getLayoutConstraint();

-		location6016.setX(0);

-		location6016.setY(40);

-		Node label6017 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeUsageEditPart.VISUAL_ID));

-		label6017.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6017 = (Location) label6017.getLayoutConstraint();

-		location6017.setX(0);

-		location6017.setY(60);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createDependency_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(DependencyEditPart.VISUAL_ID));

-		edge.setElement(domainElement);

-		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "DependencyLink");

-		//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 label6026 = createLabel(edge, UMLVisualIDRegistry.getType(DependencyNameEditPart.VISUAL_ID));

-		label6026.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6026 = (Location) label6026.getLayoutConstraint();

-		location6026.setX(0);

-		location6026.setY(40);

-		Node label6027 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeDependencyEditPart.VISUAL_ID));

-		label6027.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6027 = (Location) label6027.getLayoutConstraint();

-		location6027.setX(0);

-		location6027.setY(60);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createDependency_4018(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Connector edge = NotationFactory.eINSTANCE.createConnector();

-		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

-		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		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(DependencyBranchEditPart.VISUAL_ID));

-		edge.setElement(domainElement);

-		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "DependencyBranchLink");

-		//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 createElementImport_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(ElementImportEditPart.VISUAL_ID));

-		edge.setElement(domainElement);

-		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ElementImport");

-		//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 label6020 = createLabel(edge, UMLVisualIDRegistry.getType(ElementImportAliasEditPart.VISUAL_ID));

-		label6020.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6020 = (Location) label6020.getLayoutConstraint();

-		location6020.setX(0);

-		location6020.setY(40);

-		Node label6021 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeElementImportEditPart.VISUAL_ID));

-		label6021.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6021 = (Location) label6021.getLayoutConstraint();

-		location6021.setX(0);

-		location6021.setY(60);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createPackageImport_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(PackageImportEditPart.VISUAL_ID));

-		edge.setElement(domainElement);

-		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "PackageImport");

-		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		//if (routing != null) {

-		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		//}

-		Node label6022 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypePackageImportEditPart.VISUAL_ID));

-		label6022.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6022 = (Location) label6022.getLayoutConstraint();

-		location6022.setX(0);

-		location6022.setY(40);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createPackageMerge_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(PackageMergeEditPart.VISUAL_ID));

-		edge.setElement(domainElement);

-		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "PackageMerge");

-		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		//if (routing != null) {

-		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		//}

-		Node label6030 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypePackageMergeEditPart.VISUAL_ID));

-		label6030.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6030 = (Location) label6030.getLayoutConstraint();

-		location6030.setX(0);

-		location6030.setY(40);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createProfileApplication_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(ProfileApplicationEditPart.VISUAL_ID));

-		edge.setElement(domainElement);

-		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ProfileApplication");

-		//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_4013(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();

-

-		//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_4014(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Connector edge = NotationFactory.eINSTANCE.createConnector();

-		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

-		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		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();

-

-		//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 createTemplateBinding_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(TemplateBindingEditPart.VISUAL_ID));

-		edge.setElement(domainElement);

-		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "TemplateBinding");

-		//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 label6023 = createLabel(edge, UMLVisualIDRegistry.getType(BindingSubstitutionEditPart.VISUAL_ID));

-		label6023.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6023 = (Location) label6023.getLayoutConstraint();

-		location6023.setX(0);

-		location6023.setY(40);

-		Node label6036 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeTemplateBindingEditPart.VISUAL_ID));

-		label6036.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6036 = (Location) label6036.getLayoutConstraint();

-		location6036.setX(0);

-		location6036.setY(20);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createGeneralizationSet_4020(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(GeneralizationSetEditPart.VISUAL_ID));

-		edge.setElement(domainElement);

-		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "GeneralizationSet");

-		//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 label5067 = createLabel(edge, UMLVisualIDRegistry.getType(ConstraintLabelEditPart.VISUAL_ID));

-		label5067.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location5067 = (Location) label5067.getLayoutConstraint();

-		location5067.setX(0);

-		location5067.setY(20);

-		Node label6037 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeGeneralizationSetLabelEditPart.VISUAL_ID));

-		label6037.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6037 = (Location) label6037.getLayoutConstraint();

-		location6037.setX(0);

-		location6037.setY(40);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createInstanceSpecification_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(InstanceSpecificationLinkEditPart.VISUAL_ID));

-		edge.setElement(domainElement);

-		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InstanceSpecificationLink");

-		//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 label6039 = createLabel(edge, UMLVisualIDRegistry.getType(SourceISLinkLabelEditPart.VISUAL_ID));

-		label6039.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6039 = (Location) label6039.getLayoutConstraint();

-		location6039.setX(0);

-		location6039.setY(20);

-		Node label6038 = createLabel(edge, UMLVisualIDRegistry.getType(TargetISLinkLabelEditPart.VISUAL_ID));

-		label6038.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6038 = (Location) label6038.getLayoutConstraint();

-		location6038.setX(0);

-		location6038.setY(20);

-

-		return edge;

-	}

-

-	/**

-	 * @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(ContainmentSubLinkEditPart.VISUAL_ID));

-		edge.setElement(null);

-		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ContainmentSubLink");

-		//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_4023(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(ContainmentLinkEditPart.VISUAL_ID));

-		edge.setElement(null);

-		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ContainmentLink");

-		//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 createTimeObservationEvent_4024(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(ConnectorTimeObservationEditPart.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 createDurationObservationEvent_4025(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(ConnectorDurationObservationEditPart.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 createInformationFlow_4026(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 label6040 = createLabel(edge, UMLVisualIDRegistry.getType(InformationFlowConveyedLabelEditPart.VISUAL_ID));

-		label6040.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6040 = (Location) label6040.getLayoutConstraint();

-		location6040.setX(0);

-		location6040.setY(30);

-		Node label6041 = createLabel(edge, UMLVisualIDRegistry.getType(InformationFlowAppliedStereotypeEditPart.VISUAL_ID));

-		label6041.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6041 = (Location) label6041.getLayoutConstraint();

-		location6041.setX(0);

-		location6041.setY(15);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Edge createConstraintContext_8500(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

-		Connector edge = NotationFactory.eINSTANCE.createConnector();

-		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

-		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

-		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(ContextLinkEditPart.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);

-		//}

-		Node label8501 = createLabel(edge, UMLVisualIDRegistry.getType(ContextLinkAppliedStereotypeEditPart.VISUAL_ID));

-		label8501.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location8501 = (Location) label8501.getLayoutConstraint();

-		location8501.setX(0);

-		location8501.setY(15);

-

-		return edge;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void stampShortcut(View containerView, Node target) {

-		if (!ModelEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(containerView))) {

-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();

-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$

-			shortcutAnnotation.getDetails().put("modelID", ModelEditPart.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLPropertySection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLPropertySection.java
deleted file mode 100644
index 16062a4ca29..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLPropertySection.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLSheetLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLSheetLabelProvider.java
deleted file mode 100644
index d29bab4d810..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLSheetLabelProvider.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.clazz.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.clazz.navigator.UMLNavigatorGroup;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.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);

-		if (element instanceof UMLNavigatorGroup) {

-			return ((UMLNavigatorGroup) element).getGroupName();

-		}

-		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;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
index f3f59855a02..41a3c7c200c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
@@ -1,4 +1,11 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.common.groups.commands,

+ org.eclipse.papyrus.uml.diagram.common.groups.core.utils,

+ org.eclipse.papyrus.uml.diagram.common.groups.edit.policies,

+ org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment,

+ org.eclipse.papyrus.uml.diagram.common.groups.preferences,

+ org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance,

+ org.eclipse.papyrus.uml.diagram.common.groups.utils

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.gmf.runtime.diagram.ui.properties,

@@ -8,21 +15,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.uml2.uml;bundle-version="4.0.0",

  org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.common.groups.commands,

- org.eclipse.papyrus.uml.diagram.common.groups.core.utils,

- org.eclipse.papyrus.uml.diagram.common.groups.edit.policies,

- org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment,

- org.eclipse.papyrus.uml.diagram.common.groups.preferences,

- org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance,

- org.eclipse.papyrus.uml.diagram.common.groups.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.groups.Activa

  tor

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.groups;sin

  gleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
index 5a1b0af9d35..3226c74e787 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
@@ -1,8 +1,4 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.diagram.common.palette.customaction.providers,

- org.eclipse.papyrus.uml.diagram.common.palette.customaction.swt,

- org.eclipse.papyrus.uml.diagram.common.palette.customaction.toolbox,

- org.eclipse.papyrus.uml.diagram.common.palette.customaction.utils

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

@@ -18,14 +14,18 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.edit.ui;bundle-version="2.8.0",

  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0"

+Export-Package: org.eclipse.papyrus.uml.diagram.common.palette.customaction.providers,

+ org.eclipse.papyrus.uml.diagram.common.palette.customaction.swt,

+ org.eclipse.papyrus.uml.diagram.common.palette.customaction.toolbox,

+ org.eclipse.papyrus.uml.diagram.common.palette.customaction.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.palette.custo

  maction.Activator

-Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.palette.cu

  stomaction;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
index 9f3ec2a2f01..1c01988f0fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
@@ -45,7 +45,7 @@ Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Created-By: 1.5.0_06-b05 (Sun Microsystems Inc.)
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor,
  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.1.0",
@@ -92,7 +92,7 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
  org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
  org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
  org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.gmf.tooling.runtime,

+ org.eclipse.gmf.tooling.runtime,
  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0",
  org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="1.0.0",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0"
@@ -100,8 +100,8 @@ Bundle-Vendor: %providerName
 Ant-Version: Apache Ant 1.7.0
 Bundle-Version: 1.0.0.qualifier
 Eclipse-BuddyPolicy: dependent
-Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.Activator
+Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common;singleton:
  =true
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
index 9511803f965..3296d23cd86 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
@@ -52,9 +52,9 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

-Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.communication.part.U

  MLDiagramEditorPlugin

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.communication;sin

  gleton:=true

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
index dd5181f3002..d91d79f0d89 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
@@ -59,13 +59,15 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gef,

  org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",

  org.eclipse.papyrus.uml.diagram.menu;bundle-version="1.0.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="0.4.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.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"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.component.part.UMLDi

+ agramEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.component; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.component;singleton:=true

+

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 b4e6e6f9196..39061024515 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
@@ -68,13 +68,15 @@ Require-Bundle: org.eclipse.emf.ecore,
  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="0.4.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.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"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.composite.part.UMLDi

+ agramEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.composite; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.composite;singleton:=true

+

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
index 674877fd667..4fe5756e826 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
@@ -15,8 +15,8 @@ Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: UML-Specific CSS concepts (Incubation)

-Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.css.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.css;singleton:=tr

  ue

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
index ed78735c02d..0327402ebef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
@@ -70,6 +70,8 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.deployment.part.UMLD

+ iagramEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.deployment; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.deployment;singleton:=true

+

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
index 931021c81fc..592e9138492 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
@@ -1,4 +1,8 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.dnd,

+ org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification,

+ org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.command,

+ org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.ui

 Require-Bundle: org.eclipse.ui,

  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

@@ -12,16 +16,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.0",

  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.dnd,

- org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification,

- org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.command,

- org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.ui

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: UML Drag and Drop (Incubation)

-Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.dnd.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.dnd;singleton:=tr

  ue

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
index 75d69c6a907..4da3b2ab5ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
@@ -1,4 +1,5 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.emftree

 Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.uml2.uml.editor;bundle-version="4.1.0",

  org.eclipse.core.runtime;bundle-version="3.7.0",

@@ -7,14 +8,13 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
  org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.emftree

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Localization: plugin

 Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

+Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.emftree.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.emftree;singleton

  :=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF
index 4b4e98583c0..f7d1a2e8c47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF
@@ -4,10 +4,10 @@ Require-Bundle: org.eclipse.ui,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Localization: plugin

 Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.icons.Activator

+Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.icons.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.icons;singleton:=

  true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
index 9b1bf302821..38c94f5ff9a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
@@ -1,4 +1,18 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.interactionoverview,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.edit.dialogs,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policy,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.factory,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.figures,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.parser,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.part,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.preferences,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.provider,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.utils

 Require-Bundle: org.eclipse.ui,

  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

@@ -38,32 +52,18 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.hyperlink;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="0.4.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.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"

-Export-Package: org.eclipse.papyrus.uml.diagram.interactionoverview,

- org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices,

- org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands,

- org.eclipse.papyrus.uml.diagram.interactionoverview.edit.dialogs,

- org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part,

- org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies,

- org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policy,

- org.eclipse.papyrus.uml.diagram.interactionoverview.factory,

- org.eclipse.papyrus.uml.diagram.interactionoverview.figures,

- org.eclipse.papyrus.uml.diagram.interactionoverview.parser,

- org.eclipse.papyrus.uml.diagram.interactionoverview.part,

- org.eclipse.papyrus.uml.diagram.interactionoverview.preferences,

- org.eclipse.papyrus.uml.diagram.interactionoverview.provider,

- org.eclipse.papyrus.uml.diagram.interactionoverview.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.interactionoverview.

  Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.interactionovervi

  ew;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
index 85fa3c37216..0406d7e1de9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
@@ -1,4 +1,7 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.menu,

+ org.eclipse.papyrus.uml.diagram.menu.actions,

+ org.eclipse.papyrus.uml.diagram.menu.actions.handlers

 Require-Bundle: org.eclipse.ui,

  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",

@@ -24,16 +27,13 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.menu,

- org.eclipse.papyrus.uml.diagram.menu.actions,

- org.eclipse.papyrus.uml.diagram.menu.actions.handlers

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.menu.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.menu;singleton:=t

  rue

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
index d1cddc7b8a8..a075773a0b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
@@ -17,16 +17,16 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="0.4.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.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"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.modelexplorer.Activa

  tor

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.modelexplorer;sin

  gleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
index 4304cea5112..4f8ed481d18 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.navigation

 Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.0",

  org.eclipse.uml2.uml,

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

  org.eclipse.draw2d;bundle-version="3.7.1",

  org.eclipse.jface;bundle-version="3.8.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.navigation

 Bundle-Vendor: %providerName

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

+Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.navigation;single

  ton:=true

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
index aa5e48aea01..18b7811c634 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
@@ -1,25 +1,28 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider

-Require-Bundle: org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.0.0";visibility:=reexport,

  org.eclipse.emf.edit;visibility:=reexport,

  org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,

  org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.0.0",

  org.eclipse.emf.edit,

  org.eclipse.emf.ecore,

- org.eclipse.emf.ecore.edit,
+ org.eclipse.emf.ecore.edit,

  org.eclipse.uml2.uml,

  org.eclipse.uml2.uml.edit,

- org.eclipse.papyrus.emf.facet.efacet.metamodel.edit

+ org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;bundle-version="1.0.0"

+Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration.p

+ rovider

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration

+ .edit.provider.PaletteConfigurationEditPlugin$Implementation

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit.provider.PaletteConfigurationEditPlugin$Implementation

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfigurat

+ ion.edit;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
index febd02fa499..f87cbe69dff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
@@ -1,9 +1,4 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration.descriptor,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration.util

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

@@ -18,14 +13,21 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.papyrus.editor;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0"

+Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration,

+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.descriptor,

+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl,

+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider,

+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.util

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration

+ .Activator

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration;singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfigurat

+ ion;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
index f64cb487ea0..4a23f67730d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
@@ -84,6 +84,8 @@ Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.part.UMLDiag

+ ramEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile;singleton:=true

+

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
index 137f52cd889..e4512b9a857 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
@@ -71,12 +71,14 @@ Require-Bundle: org.eclipse.core.expressions,
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence; singleton:=true

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.part.UMLDia

+ gramEditorPlugin

 Import-Package: org.eclipse.core.databinding.observable,

  org.eclipse.papyrus.infra.emf.databinding,

  org.eclipse.papyrus.infra.tools.databinding,

  org.eclipse.papyrus.uml.tools.databinding,

  org.eclipse.papyrus.views.properties.contexts,

  org.eclipse.papyrus.views.properties.modelelement

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence;singleton:=true

+

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
index f7c7333e33f..50d9665406d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
@@ -84,6 +84,8 @@ Bundle-Vendor: %providerName
 Ant-Version: Apache Ant 1.7.0

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.statemachine.part.UM

+ LDiagramEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.statemachine; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.statemachine;singleton:=true

+

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
index aa72b9f1fd2..452d0e580a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
@@ -1,4 +1,7 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.stereotype.edition.command,

+ org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart,

+ org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies

 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui,

  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

@@ -12,17 +15,14 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.profile;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.stereotype.edition.command,

- org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart,

- org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.stereotype.edition.A

  ctivator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotype.editio

  n;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
index 416af96a60a..e68f2f69216 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
@@ -1,4 +1,6 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.symbols,

+ org.eclipse.papyrus.uml.diagram.symbols.provider

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime;bundle-version="3.8.0",

  org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.0",

@@ -17,14 +19,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

  org.w3c.dom.svg;bundle-version="1.1.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.symbols,

- org.eclipse.papyrus.uml.diagram.symbols.provider

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.symbols.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.symbols;singleton

  :=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
index 6da8da94fb0..90acd9dce7a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
@@ -73,7 +73,8 @@ Require-Bundle: org.eclipse.emf.ecore,
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagr

+ amEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.timing; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.timing;singleton:=true

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
index 546fcb7082d..4019b95500f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
@@ -75,6 +75,8 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiag

+ ramEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.usecase; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.usecase;singleton:=true

+

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
index a94137414af..836b8b967cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
@@ -1,4 +1,9 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.wizards,

+ org.eclipse.papyrus.uml.diagram.wizards.category,

+ org.eclipse.papyrus.uml.diagram.wizards.kind,

+ org.eclipse.papyrus.uml.diagram.wizards.pages,

+ org.eclipse.papyrus.uml.diagram.wizards.utils

 Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.emf.edit.ui;bundle-version="2.4.0",

  org.eclipse.emf.ecore.edit;bundle-version="2.4.0",

@@ -16,18 +21,13 @@ Require-Bundle: 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.viewpoints.policy;bundle-version="1.0.0",

  org.eclipse.core.expressions;bundle-version="3.4.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.wizards,

- org.eclipse.papyrus.uml.diagram.wizards.category,

- org.eclipse.papyrus.uml.diagram.wizards.kind,

- org.eclipse.papyrus.uml.diagram.wizards.pages,

- org.eclipse.papyrus.uml.diagram.wizards.utils

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Localization: plugin

 Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

+Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.wizards.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards;singleton

  :=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5