424316: [Component diagram] add parts connector and port on parts in the

component diagram https://bugs.eclipse.org/bugs/show_bug.cgi?id=424316
author: ptessier 2014-01-06 10:54:29 +0000
committer: ptessier 2014-01-06 10:54:29 +0000
commit: 9f2dd54ebc0ee5dbcbd0480e5daa5306787c76d8 (patch)
tree: 3dc87d99c1f0e08927b4ece50d23702b529b0ee9
parent: d84e0078eda48d23a53f2f36009e2cf375f042d4 (diff)
download: org.eclipse.papyrus-9f2dd54ebc0ee5dbcbd0480e5daa5306787c76d8.tar.gz
org.eclipse.papyrus-9f2dd54ebc0ee5dbcbd0480e5daa5306787c76d8.tar.xz
org.eclipse.papyrus-9f2dd54ebc0ee5dbcbd0480e5daa5306787c76d8.zip
75 files changed, 3417 insertions, 89 deletions
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/xtend-gen/org/eclipse/papyrus/infra/gmfdiag/generator/.gitignore b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/xtend-gen/org/eclipse/papyrus/infra/gmfdiag/generator/.gitignore
new file mode 100644
index 00000000000..d721d4ae5ab
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/xtend-gen/org/eclipse/papyrus/infra/gmfdiag/generator/.gitignore
@@ -0,0 +1 @@
+/CSSGenerator.java
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 9e074fa6948..a229b78111b 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
@@ -62,10 +62,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.menu;bundle-version="1.0.0"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.10.1.qualifier
 Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.component.part.UMLDi
- agramEditorPlugin
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.component;singlet
- on:=true
-
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.component; singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/PropertyPartEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/PropertyPartEditPartCN.java
new file mode 100644
index 00000000000..534b29b20d0
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/PropertyPartEditPartCN.java
@@ -0,0 +1,81 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST)- Initial API and implementation
+ /*****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.component.custom.edit.part;
+
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
+import org.eclipse.uml2.uml.AggregationKind;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * <pre>
+ * This class will be inherited by the GMF generated {@link org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartEditPartCN}
+ * in order to refresh the related figure when when the Property::aggregation eAttribute value 
+ * changes.
+ * </pre>
+ */
+public abstract class PropertyPartEditPartCN extends NamedElementEditPart {
+
+	/**
+	 * Constructor
+	 * 
+	 * @param view
+	 */
+	public PropertyPartEditPartCN(View view) {
+		super(view);
+	}
+
+	/**
+	 * <pre>
+	 * Calls the figure refresh when a change event is detected on 
+	 * UMLPackage.eINSTANCE.getProperty_Aggregation().
+	 * 
+	 * {@inheritDoc}
+	 * </pre>
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+
+		if((resolveSemanticElement() != null) && (resolveSemanticElement().equals(event.getNotifier()))) {
+			if(UMLPackage.eINSTANCE.getProperty_Aggregation().equals(event.getFeature())) {
+				refreshVisuals();
+			}
+		}
+		super.handleNotificationEvent(event);
+	}
+	
+
+	/**
+	 * <pre>
+	 * Refresh the figure with dashed border when Property aggregation value is SHARED.
+	 * Else set the border style to solid line.
+	 * 
+	 * {@inheritDoc}
+	 * </pre>
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		if((resolveSemanticElement() != null) && (resolveSemanticElement() instanceof Property)) {
+			if(((Property)resolveSemanticElement()).getAggregation().equals(AggregationKind.SHARED_LITERAL)) {
+				getPrimaryShape().setLineStyle(Graphics.LINE_CUSTOM);
+			} else {
+				getPrimaryShape().setLineStyle(Graphics.LINE_SOLID);
+			}
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/LollipopInterfaceFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/LollipopInterfaceFigure.java
index dd45ca39a26..3163a200892 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/LollipopInterfaceFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/LollipopInterfaceFigure.java
@@ -1,3 +1,15 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST)- Initial API and implementation
+ /*****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes;
 
 import org.eclipse.draw2d.Graphics;
@@ -130,25 +142,21 @@ public class LollipopInterfaceFigure  extends PapyrusNodeFigure implements IPapy
 
 	}
 
-	@Override
 	public void setStereotypeDisplay(String stereotypes, Image image) {
 		// TODO Auto-generated method stub
 
 	}
 
-	@Override
 	public void setStereotypePropertiesInBrace(String stereotypeProperties) {
 		// TODO Auto-generated method stub
 
 	}
 
-	@Override
 	public void setStereotypePropertiesInCompartment(String stereotypeProperties) {
 		// TODO Auto-generated method stub
 
 	}
 
-	@Override
 	public Label getStereotypesLabel() {
 		// TODO Auto-generated method stub
 		return null;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/PropertyPartFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/PropertyPartFigure.java
new file mode 100644
index 00000000000..b4c1142f171
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/PropertyPartFigure.java
@@ -0,0 +1,64 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST)- Initial API and implementation
+ /*****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.CompartmentFigure;
+
+/**
+ * Figure for Composite representation of Class.
+ */
+public class PropertyPartFigure extends CompartmentFigure {
+
+	/** The Internal Structure Compartment */
+	private final static String COMPOSITE_COMPARTMENT = "compositeCompartment";
+
+	/** The List of Compartment */
+	private final static List<String> COMPARTMENT = new ArrayList<String>() {
+
+		private static final long serialVersionUID = 1L;
+		{
+			add(COMPOSITE_COMPARTMENT);
+		}
+	};
+
+	/**
+	 * Default Constructor
+	 */
+	public PropertyPartFigure() {
+		this(null);
+	}
+
+	/**
+	 * Create a new Classifier figure with the given tag
+	 * 
+	 * @param tagLabel
+	 *        a String that will be displayed at the top of the figure
+	 */
+	public PropertyPartFigure(String tagLabel) {
+		super(COMPARTMENT, tagLabel);
+	}
+
+	/**
+	 * Get the attribute's compartment figure
+	 * 
+	 * @return
+	 */
+	public IFigure getCompositeCompartmentFigure() {
+		return getCompartment(COMPOSITE_COMPARTMENT);
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/messages.properties
index 0df5b2ee507..2460211b293 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/messages.properties
@@ -149,3 +149,5 @@ InterfaceRealizationCreationTool_title=Interface Realization
 InterfaceRealizationCreationTool_desc=Create an Interface Realization
 ComponentRealizationCreationTool_title=Component Realization
 ComponentRealizationCreationTool_desc=Create a Component Realization
+createPartCreationTool_title=Part
+createPartCreationTool_desc=create a part
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
index 4c30da43096..d19c5ef0310 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
@@ -987,6 +987,88 @@
           </modelFacet>
         </labels>
       </childNodes>
+      <childNodes
+          visualID="3079"
+          editPartClassName="PropertyPartEditPartCN"
+          containers="/0/@diagram/@compartments.0 /0/@diagram/@compartments.5 /0/@diagram/@compartments.6">
+        <diagramRunTimeClass
+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+        <elementType
+            xsi:type="gmfgen:MetamodelType"/>
+        <viewmap
+            xsi:type="gmfgen:FigureViewmap"
+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PropertyPartFigure">
+          <attributes
+              xsi:type="gmfgen:StyleAttributes"
+              fixedForeground="true"
+              fixedBackground="true"/>
+          <attributes
+              xsi:type="gmfgen:DefaultSizeAttributes"
+              width="150"
+              height="70"/>
+        </viewmap>
+        <behaviour
+            xsi:type="gmfgen:CustomBehaviour"
+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
+        <behaviour
+            xsi:type="gmfgen:CustomBehaviour"
+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
+        <behaviour
+            xsi:type="gmfgen:CustomBehaviour"
+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
+        <behaviour
+            xsi:type="gmfgen:CustomBehaviour"
+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
+        <modelFacet>
+          <metaClass
+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property"/>
+          <containmentMetaFeature
+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>
+          <modelElementInitializer
+              xsi:type="gmfgen:GenFeatureSeqInitializer">
+            <initializers
+                xsi:type="gmfgen:GenFeatureValueSpec"
+                value="/0/@expressionProviders/@providers.1/@expressions.0">
+              <feature
+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+            </initializers>
+          </modelElementInitializer>
+        </modelFacet>
+        <labels
+            visualID="5268"
+            editPartClassName="PropertyPartNameEditPartCN"
+            itemSemanticEditPolicyClassName="PropertyPartNameItemSemanticEditPolicyCN"
+            elementIcon="true">
+          <diagramRunTimeClass
+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+          <viewmap
+              xsi:type="gmfgen:ParentAssignedViewmap"
+              getterName="getNameLabel"
+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
+            <attributes
+                xsi:type="gmfgen:StyleAttributes"
+                fixedFont="true"
+                fixedForeground="true"/>
+          </viewmap>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PropertyLabelEditPolicy"/>
+          <modelFacet
+              xsi:type="gmfgen:FeatureLabelModelFacet"
+              parser="/0/@labelParsers/@implementations.0"
+              viewPattern="{0}"
+              editorPattern="{0}"
+              editPattern="{0}">
+            <metaFeatures
+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+          </modelFacet>
+        </labels>
+      </childNodes>
       <topLevelNodes
           visualID="3203"
           editPartClassName="DependencyNodeEditPart"
@@ -2460,8 +2542,9 @@
           editPartClassName="ComponentCompositeCompartmentEditPart"
           itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicy"
           canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.4"
+          childNodes="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.12"
           title="CompositeCompartment"
+          hideIfEmpty="false"
           node="/0/@diagram/@topLevelNodes.1"
           listLayout="false">
         <diagramRunTimeClass
@@ -2584,8 +2667,9 @@
           editPartClassName="ComponentCompositeCompartmentEditPartCN"
           itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicyCN"
           canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.4"
+          childNodes="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.12"
           title="CompositeCompartmentCN"
+          hideIfEmpty="false"
           node="/0/@diagram/@childNodes.4"
           listLayout="false">
         <diagramRunTimeClass
@@ -2608,8 +2692,9 @@
           editPartClassName="ComponentCompositeCompartmentEditPartPCN"
           itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicyPCN"
           canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicyPCN"
-          childNodes="/0/@diagram/@childNodes.4"
+          childNodes="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.12"
           title="CompositeCompartmentPCN"
+          hideIfEmpty="false"
           node="/0/@diagram/@childNodes.5"
           listLayout="false">
         <diagramRunTimeClass
@@ -2751,7 +2836,7 @@
               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
               createMethodName="createPropertyCreationTool"
               id="&quot;component.tool.property&quot;"
-              genNodes="/0/@diagram/@childNodes.8"/>
+              genNodes="/0/@diagram/@childNodes.8 /0/@diagram/@childNodes.12"/>
           <entries
               xsi:type="gmfgen:ToolEntry"
               title="Operation"
@@ -2996,7 +3081,7 @@
         extensibleViaService="true">
       <implementations
           xsi:type="gmfgen:PredefinedParser"
-          uses="/0/@diagram/@childNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@childNodes.4/@labels.0/@modelFacet /0/@diagram/@childNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.11/@labels.0/@modelFacet /0/@diagram/@childNodes.7/@labels.0/@modelFacet /0/@diagram/@links.6/@labels.0/@modelFacet /0/@diagram/@links.3/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@childNodes.2/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labelModelFacet /0/@diagram/@childNodes.9/@labelModelFacet /0/@diagram/@childNodes.10/@labelModelFacet /0/@diagram/@childNodes.3/@labels.0/@modelFacet"/>
+          uses="/0/@diagram/@childNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@childNodes.4/@labels.0/@modelFacet /0/@diagram/@childNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.11/@labels.0/@modelFacet /0/@diagram/@childNodes.7/@labels.0/@modelFacet /0/@diagram/@links.6/@labels.0/@modelFacet /0/@diagram/@links.3/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@childNodes.2/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labelModelFacet /0/@diagram/@childNodes.9/@labelModelFacet /0/@diagram/@childNodes.10/@labelModelFacet /0/@diagram/@childNodes.3/@labels.0/@modelFacet /0/@diagram/@childNodes.12/@labels.0/@modelFacet"/>
       <implementations
           xsi:type="gmfgen:CustomParser"
           uses="/0/@diagram/@topLevelNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.6/@labels.0/@modelFacet"
@@ -3026,6 +3111,12 @@
         superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart"/>
     <extensionNodes
         xsi:type="papyrusgmfgenextension:ExtendedGenView"
+        comment="This manages graphical refresh when aggregation kind changes"
+        genView="/0/@diagram/@childNodes.12"
+        name="EP_ConnectableElement_As_Part_NODE"
+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.component.custom.edit.part.PropertyPartEditPartCN"/>
+    <extensionNodes
+        xsi:type="papyrusgmfgenextension:ExtendedGenView"
         comment="Elements that inherits Composite"
         genView="/0/@diagram/@topLevelNodes.1 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5"
         name="Composite inheritance"
@@ -3102,15 +3193,10 @@
         name="DirectedRelationship"
         genView="/0/@diagram/@links.2 /0/@diagram/@links.0 /0/@diagram/@links.1 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.10 /0/@diagram/@links.11"/>
     <extensionNodes
-        xsi:type="papyrusgmfgenextension:CompartmentVisibilityPreference"
-        comment="Hidden Compartements"
-        visibleByDefault="false"
-        compartments="/0/@diagram/@compartments.0 /0/@diagram/@compartments.5 /0/@diagram/@compartments.6"/>
-    <extensionNodes
         xsi:type="papyrusgmfgenextension:CompartmentTitleVisibilityPreference"
         comment="Hidden Compartments Title"
         visibleByDefault="false"
-        compartments="/0/@diagram/@compartments.0 /0/@diagram/@compartments.5 /0/@diagram/@compartments.6 /0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.1 /0/@diagram/@compartments.3 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10"/>
+        compartments="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.1 /0/@diagram/@compartments.3 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.0 /0/@diagram/@compartments.5 /0/@diagram/@compartments.6"/>
     <extensionNodes
         xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"
         comment="Name"
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.properties
index fca4000f58b..3b14b9fb0cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.properties
@@ -59,3 +59,4 @@ metatype.name.Interface_3078=Interface
 metatype.name.NamedElement_3072=Interface
 metatype.name.Link_4018=InterfacePortLink
 
+metatype.name.Property_3079=Property
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
index 40e5768ea23..a571c1a4153 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
@@ -299,7 +299,7 @@
       <viewProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLViewProvider">
          <Priority name="Lowest"/>
          <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLComponentDiagram"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072,3079"/>
          <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4001,4006,4003,4012,4014,4007,4013,4016,4015,4009,4010,4017,4018"/>
       </viewProvider>
    </extension>
@@ -312,13 +312,13 @@
             <method name="getType()" value="PapyrusUMLComponentDiagram"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
-            <method name="getType()" value="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072"/>
+            <method name="getType()" value="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072,3079"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
             <method name="getType()" value="4001,4006,4003,4012,4014,4007,4013,4016,4015,4009,4010,4017,4018"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
-            <method name="getType()" value="5008,5004,5262,5254,5266,5255,5252,5253,5265,5005,5006,5007,5264,5261,5267,5256,5257,5258,5259,5260,0"/>
+            <method name="getType()" value="5008,5004,5262,5254,5266,5255,5252,5253,5265,5005,5006,5007,5264,5261,5267,5256,5257,5258,5259,5260,0,5268"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
             <method name="getType()" value="7001,7006,7002,7007,7005,7003,7004,7008,7009,7010,7011"/>
@@ -353,7 +353,8 @@
          <object class="org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart" id="Operation_5"/>
          <object class="org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart" id="Reception_6"/>
          <object class="org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN" id="Interface_3072"/>
-         <context elements="Package_1000,Dependency_3203,Component_2002,Model_3202,Package_3200,Interface_3205,Comment_3201,Constraint_3199,NamedElement_3204,NamedElement_2003,Port_3069,Model_3077,Package_3076,Interface_3078,Component_3070,Component_3071,Comment_3074,Constraint_3075,Property_1,Operation_5,Reception_6,Interface_3072"/>
+         <object class="org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN" id="Property_3079"/>
+         <context elements="Package_1000,Dependency_3203,Component_2002,Model_3202,Package_3200,Interface_3205,Comment_3201,Constraint_3199,NamedElement_3204,NamedElement_2003,Port_3069,Model_3077,Package_3076,Interface_3078,Component_3070,Component_3071,Comment_3074,Constraint_3075,Property_1,Operation_5,Reception_6,Interface_3072,Property_3079"/>
       </modelingAssistantProvider>
    </extension>
 
@@ -584,6 +585,16 @@
       </metamodel>
       <metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
          <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Property_3079"
+               name="%metatype.name.Property_3079"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Property"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PropertyEditHelper">
+            <param name="semanticHint" value="3079"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
+         <metamodelType
                id="org.eclipse.papyrus.uml.diagram.component.Usage_4001"
                name="%metatype.name.Usage_4001"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
@@ -740,6 +751,7 @@
          <elementType ref="org.eclipse.papyrus.uml.diagram.component.Operation_5"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.component.Reception_6"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.component.Interface_3072"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Property_3079"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.component.Usage_4001"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.component.InterfaceRealization_4006"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.component.Generalization_4003"/>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PropertyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PropertyCreateCommand.java
new file mode 100644
index 00000000000..f52dbd6f352
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PropertyCreateCommand.java
@@ -0,0 +1,110 @@
+/*
+ * 
+ */
+package org.eclipse.papyrus.uml.diagram.component.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import 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.View;
+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.StructuredClassifier;
+import org.eclipse.uml2.uml.UMLFactory;
+
+/**
+ * @generated
+ */
+public class PropertyCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private EClass eClass = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public PropertyCreateCommand(CreateElementRequest req, EObject eObject) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.eClass = eObject != null ? eObject.eClass() : null;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static PropertyCreateCommand create(CreateElementRequest req, EObject eObject) {
+		return new PropertyCreateCommand(req, eObject);
+	}
+
+	/**
+	 * @generated
+	 */
+	public PropertyCreateCommand(CreateElementRequest req) {
+		super(req.getLabel(), null, req);
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 * 
+	 * @generated
+	 */
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest)getRequest()).getContainer();
+		if(container instanceof View) {
+			container = ((View)container).getElement();
+		}
+		if(container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * @generated
+	 */
+	public boolean canExecute() {
+		return true;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		Property newElement = UMLFactory.eINSTANCE.createProperty();
+		StructuredClassifier owner = (StructuredClassifier)getElementToEdit();
+		owner.getOwnedAttributes().add(newElement);
+		ElementInitializers.getInstance().init_Property_3079(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.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java
index 7c2cc1bf0c1..984ac827787 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
@@ -349,6 +349,9 @@ public class CommentEditPart extends AbstractCommentEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.CommentAnnotatedElement_4015);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.CommentAnnotatedElement_4015);
+		}
 		return types;
 	}
 
@@ -376,6 +379,7 @@ public class CommentEditPart extends AbstractCommentEditPart {
 			types.add(UMLElementTypes.Comment_3074);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java
index 1ada0ed3758..bc6632ee81f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
@@ -349,6 +349,9 @@ public class CommentEditPartPCN extends AbstractCommentEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.CommentAnnotatedElement_4015);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.CommentAnnotatedElement_4015);
+		}
 		return types;
 	}
 
@@ -376,6 +379,7 @@ public class CommentEditPartPCN extends AbstractCommentEditPart {
 			types.add(UMLElementTypes.Comment_3074);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java
index c83c0c5203e..d8952aa4df1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java
@@ -44,8 +44,8 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
@@ -405,6 +405,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -480,6 +483,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -528,6 +534,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -576,6 +585,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -624,6 +636,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -672,6 +687,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -720,6 +738,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -745,6 +766,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -773,6 +795,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -790,6 +813,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -807,6 +831,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -824,6 +849,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -841,6 +867,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -858,6 +885,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -902,6 +930,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Generalization_4003) {
 			types.add(UMLElementTypes.Component_2002);
 			types.add(UMLElementTypes.Interface_3205);
@@ -926,6 +955,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -943,6 +973,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -960,6 +991,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -977,6 +1009,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -1000,6 +1033,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -1017,6 +1051,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java
index d1bd6f620bd..9a46b0f2d46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java
@@ -43,8 +43,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
@@ -404,6 +404,9 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -479,6 +482,9 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -527,6 +533,9 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -575,6 +584,9 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -623,6 +635,9 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -671,6 +686,9 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -719,6 +737,9 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -744,6 +765,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -772,6 +794,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -789,6 +812,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -806,6 +830,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -823,6 +848,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -840,6 +866,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -857,6 +884,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -901,6 +929,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Generalization_4003) {
 			types.add(UMLElementTypes.Component_2002);
 			types.add(UMLElementTypes.Interface_3205);
@@ -925,6 +954,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -942,6 +972,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -959,6 +990,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -976,6 +1008,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -999,6 +1032,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -1016,6 +1050,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java
index 60318a32afd..acdcb620423 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java
@@ -43,8 +43,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
@@ -404,6 +404,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -479,6 +482,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -527,6 +533,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -575,6 +584,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -623,6 +635,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -671,6 +686,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -719,6 +737,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -744,6 +765,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -772,6 +794,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -789,6 +812,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -806,6 +830,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -823,6 +848,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -840,6 +866,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -857,6 +884,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -901,6 +929,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Generalization_4003) {
 			types.add(UMLElementTypes.Component_2002);
 			types.add(UMLElementTypes.Interface_3205);
@@ -925,6 +954,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -942,6 +972,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -959,6 +990,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -976,6 +1008,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -999,6 +1032,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -1016,6 +1050,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java
index f2a9a5e7570..ad9a66b3fb3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
@@ -358,6 +358,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -415,6 +418,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -463,6 +469,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -511,6 +520,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -559,6 +571,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ConstraintConstrainedElement_4009);
 		}
@@ -613,6 +628,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ConstraintConstrainedElement_4009);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ConstraintConstrainedElement_4009);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -661,6 +679,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -709,6 +730,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -734,6 +758,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -755,6 +780,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -772,6 +798,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -789,6 +816,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -806,6 +834,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ConstraintConstrainedElement_4009) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -825,6 +854,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Comment_3074);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -842,6 +872,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -859,6 +890,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -902,6 +934,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -919,6 +952,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -936,6 +970,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -953,6 +988,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -970,6 +1006,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -993,6 +1030,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -1010,6 +1048,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java
index eb554fbac58..d9ede4ebf71 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
@@ -358,6 +358,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -415,6 +418,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -463,6 +469,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -511,6 +520,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -559,6 +571,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ConstraintConstrainedElement_4009);
 		}
@@ -613,6 +628,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ConstraintConstrainedElement_4009);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ConstraintConstrainedElement_4009);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -661,6 +679,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -709,6 +730,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -734,6 +758,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -755,6 +780,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -772,6 +798,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -789,6 +816,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -806,6 +834,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ConstraintConstrainedElement_4009) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -825,6 +854,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Comment_3074);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -842,6 +872,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -859,6 +890,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -902,6 +934,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -919,6 +952,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -936,6 +970,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -953,6 +988,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -970,6 +1006,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -993,6 +1030,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -1010,6 +1048,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java
index 9c32e82b290..35851429a59 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;
@@ -345,6 +345,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -402,6 +405,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -450,6 +456,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -498,6 +507,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -546,6 +558,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -594,6 +609,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -642,6 +660,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -667,6 +688,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -688,6 +710,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -705,6 +728,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -722,6 +746,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -739,6 +764,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -756,6 +782,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -773,6 +800,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -816,6 +844,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -833,6 +862,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -850,6 +880,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -867,6 +898,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -884,6 +916,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -907,6 +940,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -924,6 +958,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java
index 874ead5e1eb..fd2330c3e3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java
@@ -47,8 +47,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
 import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
@@ -316,6 +316,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -373,6 +376,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -421,6 +427,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -469,6 +478,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -517,6 +529,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -565,6 +580,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -613,6 +631,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -638,6 +659,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -659,6 +681,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -676,6 +699,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -693,6 +717,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -710,6 +735,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -727,6 +753,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -744,6 +771,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -787,6 +815,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -804,6 +833,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -821,6 +851,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -838,6 +869,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -855,6 +887,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -878,6 +911,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -895,6 +929,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
index 7bfc6458433..f38a4d351f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
@@ -1,3 +1,6 @@
+/*
+ * 
+ */
 package org.eclipse.papyrus.uml.diagram.component.edit.parts;
 
 import org.eclipse.draw2d.geometry.Dimension;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java
index 60f50525139..62fe7bf788f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java
@@ -44,8 +44,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
 import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -314,6 +314,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -371,6 +374,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -419,6 +425,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -467,6 +476,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -515,6 +527,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -563,6 +578,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -611,6 +629,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -636,6 +657,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -657,6 +679,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -674,6 +697,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -691,6 +715,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -708,6 +733,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -725,6 +751,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -742,6 +769,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -785,6 +813,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -802,6 +831,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -819,6 +849,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -836,6 +867,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -853,6 +885,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -876,6 +909,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -893,6 +927,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java
index 886d973e6b4..b3c4fa8acea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java
@@ -44,8 +44,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
 import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -317,6 +317,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -392,6 +395,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -440,6 +446,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -488,6 +497,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -536,6 +548,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -584,6 +599,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -632,6 +650,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -657,6 +678,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -685,6 +707,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -702,6 +725,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -719,6 +743,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -736,6 +761,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -753,6 +779,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -770,6 +797,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -815,6 +843,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -832,6 +861,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Generalization_4003) {
 			types.add(UMLElementTypes.Component_2002);
 			types.add(UMLElementTypes.Interface_3205);
@@ -856,6 +886,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -873,6 +904,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -890,6 +922,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -907,6 +940,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -930,6 +964,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -947,6 +982,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java
index 16f64908f78..cfc9114ee90 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java
@@ -1,3 +1,6 @@
+/*
+ * 
+ */
 package org.eclipse.papyrus.uml.diagram.component.edit.parts;
 
 import org.eclipse.draw2d.geometry.Dimension;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java
index 9ebbbae9b4b..e709422655b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java
@@ -1,3 +1,6 @@
+/*
+ * 
+ */
 package org.eclipse.papyrus.uml.diagram.component.edit.parts;
 
 import org.eclipse.draw2d.Connection;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java
index a0618492960..a59acdbb023 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
@@ -368,6 +368,9 @@ public class ModelEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -425,6 +428,9 @@ public class ModelEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -473,6 +479,9 @@ public class ModelEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -521,6 +530,9 @@ public class ModelEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -569,6 +581,9 @@ public class ModelEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -617,6 +632,9 @@ public class ModelEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -665,6 +683,9 @@ public class ModelEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -690,6 +711,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -711,6 +733,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -728,6 +751,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -745,6 +769,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -762,6 +787,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -779,6 +805,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -796,6 +823,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -839,6 +867,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -856,6 +885,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -873,6 +903,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -890,6 +921,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -907,6 +939,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -930,6 +963,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -947,6 +981,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java
index 053b67e7bef..81e12fe49f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;
@@ -358,6 +358,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -415,6 +418,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -463,6 +469,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -511,6 +520,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -559,6 +571,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -607,6 +622,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -655,6 +673,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -680,6 +701,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -701,6 +723,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -718,6 +741,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -735,6 +759,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -752,6 +777,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -769,6 +795,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -786,6 +813,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -829,6 +857,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -846,6 +875,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -863,6 +893,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -880,6 +911,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -897,6 +929,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -920,6 +953,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -937,6 +971,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java
index e248d0a2d77..73b245b0870 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
@@ -368,6 +368,9 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -425,6 +428,9 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -473,6 +479,9 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -521,6 +530,9 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -569,6 +581,9 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -617,6 +632,9 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -665,6 +683,9 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -690,6 +711,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -711,6 +733,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -728,6 +751,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -745,6 +769,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -762,6 +787,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -779,6 +805,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -796,6 +823,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -839,6 +867,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -856,6 +885,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -873,6 +903,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -890,6 +921,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -907,6 +939,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -930,6 +963,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -947,6 +981,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java
index 59eaef848a3..9386f95fb84 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;
@@ -358,6 +358,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -415,6 +418,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -463,6 +469,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -511,6 +520,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -559,6 +571,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -607,6 +622,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -655,6 +673,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -680,6 +701,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -701,6 +723,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -718,6 +741,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -735,6 +759,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -752,6 +777,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -769,6 +795,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -786,6 +813,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -829,6 +857,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -846,6 +875,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -863,6 +893,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -880,6 +911,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -897,6 +929,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -920,6 +953,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -937,6 +971,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java
index bb1f50a5daa..27620f879ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java
@@ -48,8 +48,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
@@ -357,6 +357,9 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -414,6 +417,9 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -462,6 +468,9 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -510,6 +519,9 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -558,6 +570,9 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -606,6 +621,9 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -654,6 +672,9 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -679,6 +700,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -700,6 +722,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -717,6 +740,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -734,6 +758,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -751,6 +776,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -768,6 +794,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -785,6 +812,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -828,6 +856,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -845,6 +874,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -862,6 +892,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -879,6 +910,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -896,6 +928,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -919,6 +952,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -936,6 +970,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java
new file mode 100644
index 00000000000..cf1bd1e015c
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java
@@ -0,0 +1,993 @@
+
+
+package org.eclipse.papyrus.uml.diagram.component.edit.parts;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Shape;
+import org.eclipse.draw2d.StackLayout;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+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.draw2d.ui.figures.FigureUtilities;
+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.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PropertyPartFigure;
+import org.eclipse.papyrus.uml.diagram.component.edit.policies.PropertyItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.swt.graphics.Color;
+
+/**
+ * @generated
+ */
+public class PropertyPartEditPartCN extends org.eclipse.papyrus.uml.diagram.component.custom.edit.part.PropertyPartEditPartCN {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 3079;
+
+	/**
+	 * @generated
+	 */
+	protected IFigure contentPane;
+
+	/**
+	 * @generated
+	 */
+	protected IFigure primaryShape;
+
+	/**
+	 * @generated
+	 */
+	public PropertyPartEditPartCN(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyItemSemanticEditPolicy());
+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
+	}
+
+	/**
+	 * Papyrus codeGen
+	 * 
+	 * @generated
+	 **/
+	protected void handleNotificationEvent(Notification event) {
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @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 PropertyPartFigure();
+	}
+
+	/**
+	 * @generated
+	 */
+	public PropertyPartFigure getPrimaryShape() {
+		return (PropertyPartFigure)primaryShape;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean addFixedChild(EditPart childEditPart) {
+		if(childEditPart instanceof PropertyPartNameEditPartCN) {
+			((PropertyPartNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean removeFixedChild(EditPart childEditPart) {
+		if(childEditPart instanceof PropertyPartNameEditPartCN) {
+			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 = "Property";
+		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 Shape) {
+			((Shape)primaryShape).setLineWidth(width);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLineType(int style) {
+		if(primaryShape instanceof Shape) {
+			((Shape)primaryShape).setLineStyle(style);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public EditPart getPrimaryChildEditPart() {
+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));
+	}
+
+	/**
+	 * @generated
+	 */
+	public List<IElementType> getMARelTypesOnSource() {
+		ArrayList<IElementType> types = new ArrayList<IElementType>(8);
+		types.add(UMLElementTypes.Usage_4001);
+		types.add(UMLElementTypes.InterfaceRealization_4006);
+		types.add(UMLElementTypes.Substitution_4012);
+		types.add(UMLElementTypes.Manifestation_4014);
+		types.add(UMLElementTypes.ComponentRealization_4007);
+		types.add(UMLElementTypes.Abstraction_4013);
+		types.add(UMLElementTypes.Dependency_4010);
+		types.add(UMLElementTypes.Dependency_4017);
+		return types;
+	}
+
+	/**
+	 * @generated
+	 */
+	public List<IElementType> getMARelTypesOnSourceAndTarget(IGraphicalEditPart targetEditPart) {
+		LinkedList<IElementType> types = new LinkedList<IElementType>();
+		if(targetEditPart instanceof DependencyNodeEditPart) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof ComponentEditPart) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof ModelEditPart) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof PackageEditPart) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPart) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof ConstraintEditPart) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof DefaultNamedElementEditPart) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof InterfaceEditPart) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof PortEditPart) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof ModelEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof PackageEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof ComponentEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof ComponentEditPartPCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof ConstraintEditPartPCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof InterfaceEditPartPCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPart) {
+			types.add(UMLElementTypes.InterfaceRealization_4006);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+			types.add(UMLElementTypes.InterfaceRealization_4006);
+		}
+		if(targetEditPart instanceof InterfaceEditPartPCN) {
+			types.add(UMLElementTypes.InterfaceRealization_4006);
+		}
+		if(targetEditPart instanceof DependencyNodeEditPart) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof ComponentEditPart) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof ModelEditPart) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof PackageEditPart) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPart) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof ConstraintEditPart) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof DefaultNamedElementEditPart) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof InterfaceEditPart) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof PortEditPart) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof ModelEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof PackageEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof ComponentEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof ComponentEditPartPCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof ConstraintEditPartPCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof InterfaceEditPartPCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
+		if(targetEditPart instanceof DependencyNodeEditPart) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof ComponentEditPart) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof ModelEditPart) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof PackageEditPart) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPart) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof ConstraintEditPart) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof DefaultNamedElementEditPart) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof InterfaceEditPart) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof PortEditPart) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof ModelEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof PackageEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof ComponentEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof ComponentEditPartPCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof ConstraintEditPartPCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof InterfaceEditPartPCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
+		if(targetEditPart instanceof DependencyNodeEditPart) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof ComponentEditPart) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof ModelEditPart) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof PackageEditPart) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPart) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof ConstraintEditPart) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof DefaultNamedElementEditPart) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof InterfaceEditPart) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof PortEditPart) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof ModelEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof PackageEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof ComponentEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof ComponentEditPartPCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof ConstraintEditPartPCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof InterfaceEditPartPCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
+		if(targetEditPart instanceof DependencyNodeEditPart) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof ComponentEditPart) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof ModelEditPart) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof PackageEditPart) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPart) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof ConstraintEditPart) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof DefaultNamedElementEditPart) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof InterfaceEditPart) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof PortEditPart) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof ModelEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof PackageEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof ComponentEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof ComponentEditPartPCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof ConstraintEditPartPCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof InterfaceEditPartPCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
+		if(targetEditPart instanceof DependencyNodeEditPart) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof ComponentEditPart) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof ModelEditPart) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof PackageEditPart) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPart) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof ConstraintEditPart) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof DefaultNamedElementEditPart) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof InterfaceEditPart) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof PortEditPart) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof ModelEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof PackageEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof ComponentEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof ComponentEditPartPCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof ConstraintEditPartPCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof InterfaceEditPartPCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
+		if(targetEditPart instanceof DependencyNodeEditPart) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof ComponentEditPart) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof ModelEditPart) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof PackageEditPart) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPart) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof ConstraintEditPart) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof DefaultNamedElementEditPart) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof InterfaceEditPart) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof PortEditPart) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof ModelEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof PackageEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof ComponentEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof ComponentEditPartPCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof ConstraintEditPartPCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof InterfaceEditPartPCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
+		return types;
+	}
+
+	/**
+	 * @generated
+	 */
+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {
+		LinkedList<IElementType> types = new LinkedList<IElementType>();
+		if(relationshipType == UMLElementTypes.Usage_4001) {
+			types.add(UMLElementTypes.Dependency_3203);
+			types.add(UMLElementTypes.Component_2002);
+			types.add(UMLElementTypes.Model_3202);
+			types.add(UMLElementTypes.Package_3200);
+			types.add(UMLElementTypes.Interface_3205);
+			types.add(UMLElementTypes.Constraint_3199);
+			types.add(UMLElementTypes.NamedElement_3204);
+			types.add(UMLElementTypes.NamedElement_2003);
+			types.add(UMLElementTypes.Port_3069);
+			types.add(UMLElementTypes.Model_3077);
+			types.add(UMLElementTypes.Package_3076);
+			types.add(UMLElementTypes.Interface_3078);
+			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Component_3071);
+			types.add(UMLElementTypes.Constraint_3075);
+			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
+		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
+			types.add(UMLElementTypes.Interface_3205);
+			types.add(UMLElementTypes.Interface_3078);
+			types.add(UMLElementTypes.Interface_3072);
+		} else if(relationshipType == UMLElementTypes.Substitution_4012) {
+			types.add(UMLElementTypes.Dependency_3203);
+			types.add(UMLElementTypes.Component_2002);
+			types.add(UMLElementTypes.Model_3202);
+			types.add(UMLElementTypes.Package_3200);
+			types.add(UMLElementTypes.Interface_3205);
+			types.add(UMLElementTypes.Constraint_3199);
+			types.add(UMLElementTypes.NamedElement_3204);
+			types.add(UMLElementTypes.NamedElement_2003);
+			types.add(UMLElementTypes.Port_3069);
+			types.add(UMLElementTypes.Model_3077);
+			types.add(UMLElementTypes.Package_3076);
+			types.add(UMLElementTypes.Interface_3078);
+			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Component_3071);
+			types.add(UMLElementTypes.Constraint_3075);
+			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
+		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
+			types.add(UMLElementTypes.Dependency_3203);
+			types.add(UMLElementTypes.Component_2002);
+			types.add(UMLElementTypes.Model_3202);
+			types.add(UMLElementTypes.Package_3200);
+			types.add(UMLElementTypes.Interface_3205);
+			types.add(UMLElementTypes.Constraint_3199);
+			types.add(UMLElementTypes.NamedElement_3204);
+			types.add(UMLElementTypes.NamedElement_2003);
+			types.add(UMLElementTypes.Port_3069);
+			types.add(UMLElementTypes.Model_3077);
+			types.add(UMLElementTypes.Package_3076);
+			types.add(UMLElementTypes.Interface_3078);
+			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Component_3071);
+			types.add(UMLElementTypes.Constraint_3075);
+			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
+		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
+			types.add(UMLElementTypes.Dependency_3203);
+			types.add(UMLElementTypes.Component_2002);
+			types.add(UMLElementTypes.Model_3202);
+			types.add(UMLElementTypes.Package_3200);
+			types.add(UMLElementTypes.Interface_3205);
+			types.add(UMLElementTypes.Constraint_3199);
+			types.add(UMLElementTypes.NamedElement_3204);
+			types.add(UMLElementTypes.NamedElement_2003);
+			types.add(UMLElementTypes.Port_3069);
+			types.add(UMLElementTypes.Model_3077);
+			types.add(UMLElementTypes.Package_3076);
+			types.add(UMLElementTypes.Interface_3078);
+			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Component_3071);
+			types.add(UMLElementTypes.Constraint_3075);
+			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
+		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
+			types.add(UMLElementTypes.Dependency_3203);
+			types.add(UMLElementTypes.Component_2002);
+			types.add(UMLElementTypes.Model_3202);
+			types.add(UMLElementTypes.Package_3200);
+			types.add(UMLElementTypes.Interface_3205);
+			types.add(UMLElementTypes.Constraint_3199);
+			types.add(UMLElementTypes.NamedElement_3204);
+			types.add(UMLElementTypes.NamedElement_2003);
+			types.add(UMLElementTypes.Port_3069);
+			types.add(UMLElementTypes.Model_3077);
+			types.add(UMLElementTypes.Package_3076);
+			types.add(UMLElementTypes.Interface_3078);
+			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Component_3071);
+			types.add(UMLElementTypes.Constraint_3075);
+			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
+		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
+			types.add(UMLElementTypes.Dependency_3203);
+			types.add(UMLElementTypes.Component_2002);
+			types.add(UMLElementTypes.Model_3202);
+			types.add(UMLElementTypes.Package_3200);
+			types.add(UMLElementTypes.Interface_3205);
+			types.add(UMLElementTypes.Constraint_3199);
+			types.add(UMLElementTypes.NamedElement_3204);
+			types.add(UMLElementTypes.NamedElement_2003);
+			types.add(UMLElementTypes.Port_3069);
+			types.add(UMLElementTypes.Model_3077);
+			types.add(UMLElementTypes.Package_3076);
+			types.add(UMLElementTypes.Interface_3078);
+			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Component_3071);
+			types.add(UMLElementTypes.Constraint_3075);
+			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
+		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
+			types.add(UMLElementTypes.Dependency_3203);
+			types.add(UMLElementTypes.Component_2002);
+			types.add(UMLElementTypes.Model_3202);
+			types.add(UMLElementTypes.Package_3200);
+			types.add(UMLElementTypes.Interface_3205);
+			types.add(UMLElementTypes.Constraint_3199);
+			types.add(UMLElementTypes.NamedElement_3204);
+			types.add(UMLElementTypes.NamedElement_2003);
+			types.add(UMLElementTypes.Port_3069);
+			types.add(UMLElementTypes.Model_3077);
+			types.add(UMLElementTypes.Package_3076);
+			types.add(UMLElementTypes.Interface_3078);
+			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Component_3071);
+			types.add(UMLElementTypes.Constraint_3075);
+			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
+		}
+		return types;
+	}
+
+	/**
+	 * @generated
+	 */
+	public List<IElementType> getMARelTypesOnTarget() {
+		ArrayList<IElementType> types = new ArrayList<IElementType>(9);
+		types.add(UMLElementTypes.Usage_4001);
+		types.add(UMLElementTypes.Substitution_4012);
+		types.add(UMLElementTypes.Manifestation_4014);
+		types.add(UMLElementTypes.ComponentRealization_4007);
+		types.add(UMLElementTypes.Abstraction_4013);
+		types.add(UMLElementTypes.CommentAnnotatedElement_4015);
+		types.add(UMLElementTypes.ConstraintConstrainedElement_4009);
+		types.add(UMLElementTypes.Dependency_4010);
+		types.add(UMLElementTypes.Dependency_4017);
+		return types;
+	}
+
+	/**
+	 * @generated
+	 */
+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {
+		LinkedList<IElementType> types = new LinkedList<IElementType>();
+		if(relationshipType == UMLElementTypes.Usage_4001) {
+			types.add(UMLElementTypes.Dependency_3203);
+			types.add(UMLElementTypes.Component_2002);
+			types.add(UMLElementTypes.Model_3202);
+			types.add(UMLElementTypes.Package_3200);
+			types.add(UMLElementTypes.Interface_3205);
+			types.add(UMLElementTypes.Constraint_3199);
+			types.add(UMLElementTypes.NamedElement_3204);
+			types.add(UMLElementTypes.NamedElement_2003);
+			types.add(UMLElementTypes.Port_3069);
+			types.add(UMLElementTypes.Model_3077);
+			types.add(UMLElementTypes.Package_3076);
+			types.add(UMLElementTypes.Interface_3078);
+			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Component_3071);
+			types.add(UMLElementTypes.Constraint_3075);
+			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
+		} else if(relationshipType == UMLElementTypes.Substitution_4012) {
+			types.add(UMLElementTypes.Dependency_3203);
+			types.add(UMLElementTypes.Component_2002);
+			types.add(UMLElementTypes.Model_3202);
+			types.add(UMLElementTypes.Package_3200);
+			types.add(UMLElementTypes.Interface_3205);
+			types.add(UMLElementTypes.Constraint_3199);
+			types.add(UMLElementTypes.NamedElement_3204);
+			types.add(UMLElementTypes.NamedElement_2003);
+			types.add(UMLElementTypes.Port_3069);
+			types.add(UMLElementTypes.Model_3077);
+			types.add(UMLElementTypes.Package_3076);
+			types.add(UMLElementTypes.Interface_3078);
+			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Component_3071);
+			types.add(UMLElementTypes.Constraint_3075);
+			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
+		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
+			types.add(UMLElementTypes.Dependency_3203);
+			types.add(UMLElementTypes.Component_2002);
+			types.add(UMLElementTypes.Model_3202);
+			types.add(UMLElementTypes.Package_3200);
+			types.add(UMLElementTypes.Interface_3205);
+			types.add(UMLElementTypes.Constraint_3199);
+			types.add(UMLElementTypes.NamedElement_3204);
+			types.add(UMLElementTypes.NamedElement_2003);
+			types.add(UMLElementTypes.Port_3069);
+			types.add(UMLElementTypes.Model_3077);
+			types.add(UMLElementTypes.Package_3076);
+			types.add(UMLElementTypes.Interface_3078);
+			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Component_3071);
+			types.add(UMLElementTypes.Constraint_3075);
+			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
+		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
+			types.add(UMLElementTypes.Dependency_3203);
+			types.add(UMLElementTypes.Component_2002);
+			types.add(UMLElementTypes.Model_3202);
+			types.add(UMLElementTypes.Package_3200);
+			types.add(UMLElementTypes.Interface_3205);
+			types.add(UMLElementTypes.Constraint_3199);
+			types.add(UMLElementTypes.NamedElement_3204);
+			types.add(UMLElementTypes.NamedElement_2003);
+			types.add(UMLElementTypes.Port_3069);
+			types.add(UMLElementTypes.Model_3077);
+			types.add(UMLElementTypes.Package_3076);
+			types.add(UMLElementTypes.Interface_3078);
+			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Component_3071);
+			types.add(UMLElementTypes.Constraint_3075);
+			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
+		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
+			types.add(UMLElementTypes.Dependency_3203);
+			types.add(UMLElementTypes.Component_2002);
+			types.add(UMLElementTypes.Model_3202);
+			types.add(UMLElementTypes.Package_3200);
+			types.add(UMLElementTypes.Interface_3205);
+			types.add(UMLElementTypes.Constraint_3199);
+			types.add(UMLElementTypes.NamedElement_3204);
+			types.add(UMLElementTypes.NamedElement_2003);
+			types.add(UMLElementTypes.Port_3069);
+			types.add(UMLElementTypes.Model_3077);
+			types.add(UMLElementTypes.Package_3076);
+			types.add(UMLElementTypes.Interface_3078);
+			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Component_3071);
+			types.add(UMLElementTypes.Constraint_3075);
+			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
+		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
+			types.add(UMLElementTypes.Comment_3201);
+			types.add(UMLElementTypes.Comment_3074);
+		} else if(relationshipType == UMLElementTypes.ConstraintConstrainedElement_4009) {
+			types.add(UMLElementTypes.Constraint_3199);
+			types.add(UMLElementTypes.Constraint_3075);
+		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
+			types.add(UMLElementTypes.Dependency_3203);
+			types.add(UMLElementTypes.Component_2002);
+			types.add(UMLElementTypes.Model_3202);
+			types.add(UMLElementTypes.Package_3200);
+			types.add(UMLElementTypes.Interface_3205);
+			types.add(UMLElementTypes.Constraint_3199);
+			types.add(UMLElementTypes.NamedElement_3204);
+			types.add(UMLElementTypes.NamedElement_2003);
+			types.add(UMLElementTypes.Port_3069);
+			types.add(UMLElementTypes.Model_3077);
+			types.add(UMLElementTypes.Package_3076);
+			types.add(UMLElementTypes.Interface_3078);
+			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Component_3071);
+			types.add(UMLElementTypes.Constraint_3075);
+			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
+		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
+			types.add(UMLElementTypes.Dependency_3203);
+			types.add(UMLElementTypes.Component_2002);
+			types.add(UMLElementTypes.Model_3202);
+			types.add(UMLElementTypes.Package_3200);
+			types.add(UMLElementTypes.Interface_3205);
+			types.add(UMLElementTypes.Constraint_3199);
+			types.add(UMLElementTypes.NamedElement_3204);
+			types.add(UMLElementTypes.NamedElement_2003);
+			types.add(UMLElementTypes.Port_3069);
+			types.add(UMLElementTypes.Model_3077);
+			types.add(UMLElementTypes.Package_3076);
+			types.add(UMLElementTypes.Interface_3078);
+			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Component_3071);
+			types.add(UMLElementTypes.Constraint_3075);
+			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
+		}
+		return types;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public Object getPreferredValue(EStructuralFeature feature) {
+		IPreferenceStore preferenceStore = (IPreferenceStore)getDiagramPreferencesHint().getPreferenceStore();
+		Object result = null;
+		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
+			String prefColor = null;
+			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
+				prefColor = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_LINE);
+			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
+				prefColor = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_FONT);
+			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
+				prefColor = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_FILL);
+			}
+			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
+		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_GRADIENT);
+			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
+			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
+				result = new Integer(gradientPreferenceConverter.getTransparency());
+			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
+				result = gradientPreferenceConverter.getGradientData();
+			}
+		}
+		if(result == null) {
+			result = getStructuralFeatureValue(feature);
+		}
+		return result;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java
new file mode 100644
index 00000000000..28b429aab6f
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java
@@ -0,0 +1,797 @@
+
+package org.eclipse.papyrus.uml.diagram.component.edit.parts;
+
+import java.util.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.PapyrusCompartmentEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PropertyLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 5268;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 * 
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 * 
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+
+	/**
+	 * @generated
+	 */
+	public PropertyPartNameEditPartCN(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PropertyLabelEditPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if(figure instanceof WrappingLabel) {
+			return ((WrappingLabel)figure).getText();
+		} else if(figure instanceof ILabelFigure) {
+			return ((ILabelFigure)figure).getText();
+		} else {
+			return ((Label)figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if(figure instanceof WrappingLabel) {
+			((WrappingLabel)figure).setText(text);
+		} else if(figure instanceof ILabelFigure) {
+			((ILabelFigure)figure).setText(text);
+		} else {
+			((Label)figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if(figure instanceof WrappingLabel) {
+			return ((WrappingLabel)figure).getIcon();
+		} else if(figure instanceof ILabelFigure) {
+			return ((ILabelFigure)figure).getIcon();
+		} else {
+			return ((Label)figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if(figure instanceof WrappingLabel) {
+			((WrappingLabel)figure).setIcon(icon);
+		} else if(figure instanceof ILabelFigure) {
+			((ILabelFigure)figure).setIcon(icon);
+		} else {
+			((Label)figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(WrappingLabel figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected List getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	public IGraphicalEditPart 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() {
+
+							public void run() {
+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));
+							}
+						});
+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	public IContentAssistProcessor getCompletionProcessor() {
+		if(getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		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_3079, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartNameEditPartCN.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if(manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		getManager().show();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if(getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if(getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager)getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEditRequest(Request request) {
+		final Request theRequest = request;
+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch(directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if(configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if(configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));
+					setParser(((ICustomDirectEditorConfiguration)configuration).createParser(this.resolveSemanticElement()));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if(configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				} else if(configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if(configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+				if(Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				public void run() {
+					if(isActive() && isEditable()) {
+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if((request instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest)request;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if(maskLabelPolicy == null) {
+			setLabelTextHelper(getFigure(), getLabelText());
+			setLabelIconHelper(getFigure(), getLabelIcon());
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+		if(style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if(resolveSemanticElement() instanceof Feature) {
+			if(((Feature)resolveSemanticElement()).isStatic()) {
+				((WrappingLabel)getFigure()).setTextUnderline(true);
+			} else {
+				((WrappingLabel)getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+		if(style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshFont() {
+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+		if(style != null) {
+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void addSemanticListeners() {
+		if(getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);
+			for(int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void removeSemanticListeners() {
+		if(parserElements != null) {
+			for(int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected 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 != configuration.getLanguage()) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 * 
+	 * @param theRequest
+	 *        the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				public void run() {
+					if(isActive() && isEditable()) {
+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else 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.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java
index 6d1b358bbb0..147dacb551a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java
@@ -41,8 +41,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
@@ -370,6 +370,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -445,6 +448,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -493,6 +499,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -541,6 +550,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -589,6 +601,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -637,6 +652,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -685,6 +703,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -710,6 +731,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -738,6 +760,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -755,6 +778,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -772,6 +796,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -789,6 +814,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -806,6 +832,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -823,6 +850,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -868,6 +896,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -885,6 +914,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Generalization_4003) {
 			types.add(UMLElementTypes.Component_2002);
 			types.add(UMLElementTypes.Interface_3205);
@@ -909,6 +939,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -926,6 +957,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -943,6 +975,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -960,6 +993,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -983,6 +1017,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -1000,6 +1035,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java
index 661918fea5e..5185255ddeb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java
@@ -1,3 +1,6 @@
+/*
+ * 
+ */
 package org.eclipse.papyrus.uml.diagram.component.edit.parts;
 
 import java.util.ArrayList;
@@ -29,8 +32,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
@@ -358,6 +361,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Usage_4001);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Usage_4001);
+		}
 		if(targetEditPart instanceof RectangleInterfaceEditPart) {
 			types.add(UMLElementTypes.InterfaceRealization_4006);
 		}
@@ -433,6 +439,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Substitution_4012);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Substitution_4012);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
@@ -481,6 +490,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Manifestation_4014);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Manifestation_4014);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
@@ -529,6 +541,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.ComponentRealization_4007);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.ComponentRealization_4007);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
@@ -577,6 +592,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Abstraction_4013);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Abstraction_4013);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
@@ -625,6 +643,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4010);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4010);
+		}
 		if(targetEditPart instanceof DependencyNodeEditPart) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
@@ -673,6 +694,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			types.add(UMLElementTypes.Dependency_4017);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			types.add(UMLElementTypes.Dependency_4017);
+		}
 		return types;
 	}
 
@@ -698,6 +722,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Interface_3205);
 			types.add(UMLElementTypes.Interface_3078);
@@ -726,6 +751,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -743,6 +769,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -760,6 +787,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -777,6 +805,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -794,6 +823,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -811,6 +841,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
@@ -856,6 +887,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -873,6 +905,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Generalization_4003) {
 			types.add(UMLElementTypes.Component_2002);
 			types.add(UMLElementTypes.Interface_3205);
@@ -897,6 +930,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -914,6 +948,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -931,6 +966,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -948,6 +984,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
 			types.add(UMLElementTypes.Comment_3201);
 			types.add(UMLElementTypes.Comment_3074);
@@ -971,6 +1008,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {
 			types.add(UMLElementTypes.Dependency_3203);
 			types.add(UMLElementTypes.Component_2002);
@@ -988,6 +1026,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);
 			types.add(UMLElementTypes.Constraint_3075);
 			types.add(UMLElementTypes.Interface_3072);
+			types.add(UMLElementTypes.Property_3079);
 		}
 		return types;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java
index ccb70a7b1b3..7f11a470c3c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java
@@ -1,3 +1,6 @@
+/*
+ * 
+ */
 package org.eclipse.papyrus.uml.diagram.component.edit.parts;
 
 import java.util.Collections;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java
index c3342f3b831..ac30e3cdcdc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java
@@ -124,6 +124,10 @@ public class UMLEditPartFactory implements EditPartFactory {
 				return new InterfaceEditPartPCN(view);
 			case InterfaceNameEditPartPCN.VISUAL_ID:
 				return new InterfaceNameEditPartPCN(view);
+			case PropertyPartEditPartCN.VISUAL_ID:
+				return new PropertyPartEditPartCN(view);
+			case PropertyPartNameEditPartCN.VISUAL_ID:
+				return new PropertyPartNameEditPartCN(view);
 			case ComponentCompositeCompartmentEditPart.VISUAL_ID:
 				return new ComponentCompositeCompartmentEditPart(view);
 			case ModelPackageableElementCompartmentEditPart.VISUAL_ID:
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java
index 178e449b721..dab5005fa68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java
@@ -14,9 +14,11 @@ package org.eclipse.papyrus.uml.diagram.component.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;
@@ -33,6 +35,7 @@ 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.component.edit.parts.ComponentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
@@ -49,6 +52,11 @@ public class ComponentCompositeCompartmentCanonicalEditPolicy extends CanonicalE
 	/**
 	 * @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();
@@ -59,13 +67,15 @@ public class ComponentCompositeCompartmentCanonicalEditPolicy extends CanonicalE
 	}
 
 	/**
-	 * Gets the feature to synchronize.
-	 * 
-	 * @return the feature to synchronize
 	 * @generated
 	 */
-	protected EStructuralFeature getFeatureToSynchronize() {
-		return UMLPackage.eINSTANCE.getComponent_PackagedElement();
+	protected Set getFeaturesToSynchronize() {
+		if(myFeaturesToSynchronize == null) {
+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();
+			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getComponent_PackagedElement());
+			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute());
+		}
+		return myFeaturesToSynchronize;
 	}
 
 	/**
@@ -108,7 +118,8 @@ public class ComponentCompositeCompartmentCanonicalEditPolicy extends CanonicalE
 	 * @generated
 	 */
 	private boolean isMyDiagramElement(View view) {
-		return ComponentEditPartCN.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);
+		int visualID = UMLVisualIDRegistry.getVisualID(view);
+		return visualID == ComponentEditPartCN.VISUAL_ID || visualID == PropertyPartEditPartCN.VISUAL_ID;
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java
index 3d894149f17..89de98ea1d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java
@@ -14,9 +14,11 @@ package org.eclipse.papyrus.uml.diagram.component.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;
@@ -33,6 +35,7 @@ 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.component.edit.parts.ComponentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
@@ -49,6 +52,11 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyCN extends Canonica
 	/**
 	 * @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();
@@ -59,13 +67,15 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyCN extends Canonica
 	}
 
 	/**
-	 * Gets the feature to synchronize.
-	 * 
-	 * @return the feature to synchronize
 	 * @generated
 	 */
-	protected EStructuralFeature getFeatureToSynchronize() {
-		return UMLPackage.eINSTANCE.getComponent_PackagedElement();
+	protected Set getFeaturesToSynchronize() {
+		if(myFeaturesToSynchronize == null) {
+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();
+			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getComponent_PackagedElement());
+			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute());
+		}
+		return myFeaturesToSynchronize;
 	}
 
 	/**
@@ -108,7 +118,8 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyCN extends Canonica
 	 * @generated
 	 */
 	private boolean isMyDiagramElement(View view) {
-		return ComponentEditPartCN.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);
+		int visualID = UMLVisualIDRegistry.getVisualID(view);
+		return visualID == ComponentEditPartCN.VISUAL_ID || visualID == PropertyPartEditPartCN.VISUAL_ID;
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java
index a35ed95732f..a1b3114be39 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java
@@ -14,9 +14,11 @@ package org.eclipse.papyrus.uml.diagram.component.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;
@@ -33,6 +35,7 @@ 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.component.edit.parts.ComponentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
@@ -49,6 +52,11 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyPCN extends Canonic
 	/**
 	 * @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();
@@ -59,13 +67,15 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyPCN extends Canonic
 	}
 
 	/**
-	 * Gets the feature to synchronize.
-	 * 
-	 * @return the feature to synchronize
 	 * @generated
 	 */
-	protected EStructuralFeature getFeatureToSynchronize() {
-		return UMLPackage.eINSTANCE.getComponent_PackagedElement();
+	protected Set getFeaturesToSynchronize() {
+		if(myFeaturesToSynchronize == null) {
+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();
+			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getComponent_PackagedElement());
+			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute());
+		}
+		return myFeaturesToSynchronize;
 	}
 
 	/**
@@ -108,7 +118,8 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyPCN extends Canonic
 	 * @generated
 	 */
 	private boolean isMyDiagramElement(View view) {
-		return ComponentEditPartCN.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);
+		int visualID = UMLVisualIDRegistry.getVisualID(view);
+		return visualID == ComponentEditPartCN.VISUAL_ID || visualID == PropertyPartEditPartCN.VISUAL_ID;
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
index f7dd5361c47..473de7eaf50 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
@@ -18,6 +18,7 @@ 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.uml.diagram.component.edit.commands.ComponentCreateCommandCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.PropertyCreateCommand;
 import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
 
 // TODO: Auto-generated Javadoc
@@ -69,6 +70,12 @@ public class ComponentCompositeCompartmentItemSemanticEditPolicy extends UMLBase
 			}
 			return getGEFWrapper(new ComponentCreateCommandCN(req));
 		}
+		if(UMLElementTypes.Property_3079 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new PropertyCreateCommand(req));
+		}
 		return super.getCreateCommand(req);
 	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
index 91cb2be43e3..be548445f52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -18,6 +18,7 @@ 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.uml.diagram.component.edit.commands.ComponentCreateCommandCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.PropertyCreateCommand;
 import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
 
 // TODO: Auto-generated Javadoc
@@ -69,6 +70,12 @@ public class ComponentCompositeCompartmentItemSemanticEditPolicyCN extends UMLBa
 			}
 			return getGEFWrapper(new ComponentCreateCommandCN(req));
 		}
+		if(UMLElementTypes.Property_3079 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new PropertyCreateCommand(req));
+		}
 		return super.getCreateCommand(req);
 	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyPCN.java
index 9511030f6d7..b205d5452e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyPCN.java
@@ -18,6 +18,7 @@ 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.uml.diagram.component.edit.commands.ComponentCreateCommandCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.PropertyCreateCommand;
 import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
 
 // TODO: Auto-generated Javadoc
@@ -69,6 +70,12 @@ public class ComponentCompositeCompartmentItemSemanticEditPolicyPCN extends UMLB
 			}
 			return getGEFWrapper(new ComponentCreateCommandCN(req));
 		}
+		if(UMLElementTypes.Property_3079 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new PropertyCreateCommand(req));
+		}
 		return super.getCreateCommand(req);
 	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
index caf0e0725f7..73138c5361a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
@@ -1,3 +1,6 @@
+/*
+ * 
+ */
 package org.eclipse.papyrus.uml.diagram.component.edit.policies;
 
 import java.util.ArrayList;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java
index e09555e8baf..57a380c06e2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java
@@ -1,3 +1,6 @@
+/*
+ * 
+ */
 package org.eclipse.papyrus.uml.diagram.component.edit.policies;
 
 import org.eclipse.gef.commands.Command;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
index aa071e45517..8120b78b1b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
@@ -1,3 +1,6 @@
+/*
+ * 
+ */
 package org.eclipse.papyrus.uml.diagram.component.edit.policies;
 
 import java.util.ArrayList;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java
index a16623330ab..30f55bc324c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java
@@ -1,3 +1,6 @@
+/*
+ * 
+ */
 package org.eclipse.papyrus.uml.diagram.component.edit.policies;
 
 import org.eclipse.gef.commands.Command;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelCanonicalEditPolicy.java
index a1bc003d38d..3242ec2509f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelCanonicalEditPolicy.java
@@ -77,6 +77,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;
@@ -490,6 +491,14 @@ public class ModelCanonicalEditPolicy extends CanonicalEditPolicy {
 			domain2NotationMap.putView(view.getElement(), view);
 			break;
 		}
+		case PropertyPartEditPartCN.VISUAL_ID:
+		{
+			if(!domain2NotationMap.containsKey(view.getElement())) {
+				result.addAll(UMLDiagramUpdater.getProperty_3079ContainedLinks(view));
+			}
+			domain2NotationMap.putView(view.getElement(), view);
+			break;
+		}
 		case UsageEditPart.VISUAL_ID:
 		{
 			if(!domain2NotationMap.containsKey(view.getElement())) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyItemSemanticEditPolicy.java
new file mode 100644
index 00000000000..4656f86a72f
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyItemSemanticEditPolicy.java
@@ -0,0 +1,305 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST)- Initial API and implementation
+ /*****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.component.edit.policies;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.DeleteCommand;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+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.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.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
+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.component.edit.commands.AbstractionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+
+/**
+ * @generated
+ */
+public class PropertyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	public PropertyItemSemanticEditPolicy() {
+		super(UMLElementTypes.Property_3079);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getDestroyElementCommand(DestroyElementRequest req) {
+		View view = (View)getHost().getModel();
+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);
+		cmd.setTransactionNestingEnabled(true);
+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
+		if(annotation == null) {
+			// there are indirectly referenced children, need extra commands: false
+			addDestroyShortcutsCommand(cmd, view);
+			// delete host element
+			List<EObject> todestroy = new ArrayList<EObject>();
+			todestroy.add(req.getElementToDestroy());
+			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));
+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));
+		} else {
+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));
+		}
+		return getGEFWrapper(cmd.reduce());
+	}
+
+	/**
+	 * @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.Usage_4001 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.InterfaceRealization_4006 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Substitution_4012 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Manifestation_4014 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.ComponentRealization_4007 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Abstraction_4013 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {
+			return null;
+		}
+		if(UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {
+			return null;
+		}
+		if(UMLElementTypes.Dependency_4010 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Dependency_4017 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new DependencyBranchCreateCommand(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.Usage_4001 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.InterfaceRealization_4006 == baseElementType) {
+			return null;
+		}
+		if(UMLElementTypes.Substitution_4012 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Manifestation_4014 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.ComponentRealization_4007 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Abstraction_4013 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Dependency_4010 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if(UMLElementTypes.Dependency_4017 == baseElementType) {
+			if(isExtendedType) {
+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+			}
+			return getGEFWrapper(new DependencyBranchCreateCommand(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 UsageEditPart.VISUAL_ID:
+		case InterfaceRealizationEditPart.VISUAL_ID:
+		case SubstitutionEditPart.VISUAL_ID:
+		case ManifestationEditPart.VISUAL_ID:
+		case ComponentRealizationEditPart.VISUAL_ID:
+		case AbstractionEditPart.VISUAL_ID:
+		case DependencyEditPart.VISUAL_ID:
+		case DependencyBranchEditPart.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());
+		}
+		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.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java
index 7d0aae5f03d..576f4bd0572 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java
@@ -63,6 +63,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackagePackageableEl
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackagePackageableElementCompartmentEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;
@@ -283,6 +284,14 @@ public class UMLDiagramUpdater {
 				continue;
 			}
 		}
+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {
+			Property childElement = (Property)it.next();
+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {
+				result.add(new UMLNodeDescriptor(childElement, visualID));
+				continue;
+			}
+		}
 		return result;
 	}
 
@@ -531,6 +540,14 @@ public class UMLDiagramUpdater {
 				continue;
 			}
 		}
+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {
+			Property childElement = (Property)it.next();
+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {
+				result.add(new UMLNodeDescriptor(childElement, visualID));
+				continue;
+			}
+		}
 		return result;
 	}
 
@@ -555,6 +572,14 @@ public class UMLDiagramUpdater {
 				continue;
 			}
 		}
+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {
+			Property childElement = (Property)it.next();
+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {
+				result.add(new UMLNodeDescriptor(childElement, visualID));
+				continue;
+			}
+		}
 		return result;
 	}
 
@@ -719,6 +744,8 @@ public class UMLDiagramUpdater {
 			return getReception_6ContainedLinks(view);
 		case InterfaceEditPartPCN.VISUAL_ID:
 			return getInterface_3072ContainedLinks(view);
+		case PropertyPartEditPartCN.VISUAL_ID:
+			return getProperty_3079ContainedLinks(view);
 		case UsageEditPart.VISUAL_ID:
 			return getUsage_4001ContainedLinks(view);
 		case InterfaceRealizationEditPart.VISUAL_ID:
@@ -788,6 +815,8 @@ public class UMLDiagramUpdater {
 			return getReception_6IncomingLinks(view);
 		case InterfaceEditPartPCN.VISUAL_ID:
 			return getInterface_3072IncomingLinks(view);
+		case PropertyPartEditPartCN.VISUAL_ID:
+			return getProperty_3079IncomingLinks(view);
 		case UsageEditPart.VISUAL_ID:
 			return getUsage_4001IncomingLinks(view);
 		case InterfaceRealizationEditPart.VISUAL_ID:
@@ -857,6 +886,8 @@ public class UMLDiagramUpdater {
 			return getReception_6OutgoingLinks(view);
 		case InterfaceEditPartPCN.VISUAL_ID:
 			return getInterface_3072OutgoingLinks(view);
+		case PropertyPartEditPartCN.VISUAL_ID:
+			return getProperty_3079OutgoingLinks(view);
 		case UsageEditPart.VISUAL_ID:
 			return getUsage_4001OutgoingLinks(view);
 		case InterfaceRealizationEditPart.VISUAL_ID:
@@ -1075,6 +1106,13 @@ public class UMLDiagramUpdater {
 	/**
 	 * @generated
 	 */
+	public static List<UMLLinkDescriptor> getProperty_3079ContainedLinks(View view) {
+		return Collections.emptyList();
+	}
+
+	/**
+	 * @generated
+	 */
 	public static List<UMLLinkDescriptor> getComment_3074ContainedLinks(View view) {
 		Comment modelElement = (Comment)view.getElement();
 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
@@ -1485,6 +1523,25 @@ public class UMLDiagramUpdater {
 	/**
 	 * @generated
 	 */
+	public static List<UMLLinkDescriptor> getProperty_3079IncomingLinks(View view) {
+		Property modelElement = (Property)view.getElement();
+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4001(modelElement, crossReferences));
+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4012(modelElement, crossReferences));
+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4014(modelElement, crossReferences));
+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4007(modelElement, crossReferences));
+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4013(modelElement, crossReferences));
+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4015(modelElement, crossReferences));
+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4009(modelElement, crossReferences));
+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));
+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferences));
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
 	public static List<UMLLinkDescriptor> getComment_3074IncomingLinks(View view) {
 		Comment modelElement = (Comment)view.getElement();
 		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());
@@ -1973,6 +2030,23 @@ public class UMLDiagramUpdater {
 	/**
 	 * @generated
 	 */
+	public static List<UMLLinkDescriptor> getProperty_3079OutgoingLinks(View view) {
+		Property modelElement = (Property)view.getElement();
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4001(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4006(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4012(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4014(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4007(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4013(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
 	public static List<UMLLinkDescriptor> getComment_3074OutgoingLinks(View view) {
 		Comment modelElement = (Comment)view.getElement();
 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java
index c84bf8c6e52..6dc2dfa6308 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java
@@ -258,8 +258,9 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated
 	 */
 	private Tool createPropertyCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
+		List<IElementType> types = new ArrayList<IElementType>(2);
 		types.add(UMLElementTypes.Property_1);
+		types.add(UMLElementTypes.Property_3079);
 		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
 		return tool;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLVisualIDRegistry.java
index 765d2a54bc9..fd749420bfb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLVisualIDRegistry.java
@@ -83,6 +83,8 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortAppliedStereotyp
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartNameEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;
@@ -245,6 +247,9 @@ public class UMLVisualIDRegistry {
 			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
 				return ComponentEditPartCN.VISUAL_ID;
 			}
+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {
+				return PropertyPartEditPartCN.VISUAL_ID;
+			}
 			break;
 		case ModelPackageableElementCompartmentEditPart.VISUAL_ID:
 			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
@@ -342,11 +347,17 @@ public class UMLVisualIDRegistry {
 			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
 				return ComponentEditPartCN.VISUAL_ID;
 			}
+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {
+				return PropertyPartEditPartCN.VISUAL_ID;
+			}
 			break;
 		case ComponentCompositeCompartmentEditPartPCN.VISUAL_ID:
 			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
 				return ComponentEditPartCN.VISUAL_ID;
 			}
+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {
+				return PropertyPartEditPartCN.VISUAL_ID;
+			}
 			break;
 		case InterfaceAttributeCompartmentEditPart.VISUAL_ID:
 			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {
@@ -567,10 +578,18 @@ public class UMLVisualIDRegistry {
 				return true;
 			}
 			break;
+		case PropertyPartEditPartCN.VISUAL_ID:
+			if(PropertyPartNameEditPartCN.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
 		case ComponentCompositeCompartmentEditPart.VISUAL_ID:
 			if(ComponentEditPartCN.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case ModelPackageableElementCompartmentEditPart.VISUAL_ID:
 			if(RectangleInterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
@@ -668,11 +687,17 @@ public class UMLVisualIDRegistry {
 			if(ComponentEditPartCN.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case ComponentCompositeCompartmentEditPartPCN.VISUAL_ID:
 			if(ComponentEditPartCN.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case InterfaceAttributeCompartmentEditPart.VISUAL_ID:
 			if(PropertyForInterfaceEditPart.VISUAL_ID == nodeVisualID) {
@@ -846,6 +871,7 @@ public class UMLVisualIDRegistry {
 		case InterfaceEditPartPCN.VISUAL_ID:
 		case CommentEditPartPCN.VISUAL_ID:
 		case ConstraintEditPartPCN.VISUAL_ID:
+		case PropertyPartEditPartCN.VISUAL_ID:
 		case ConstraintEditPart.VISUAL_ID:
 		case CommentEditPart.VISUAL_ID:
 		case DependencyNodeEditPart.VISUAL_ID:
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/AbstractionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/AbstractionPreferencePage.java
index c05fe8cf2d6..179956d00e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/AbstractionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/AbstractionPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/CommentPreferencePage.java
index c179f358536..649a5a628de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/CommentPreferencePage.java
@@ -13,8 +13,8 @@
 package org.eclipse.papyrus.uml.diagram.component.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentPreferencePage.java
index 11277a84140..423032803f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
 
@@ -104,7 +104,7 @@ public class ComponentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */
 	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {
 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("CompositeCompartment", Boolean.FALSE);
+		map.put("CompositeCompartment", Boolean.TRUE);
 		return map;
 	}
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentRealizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentRealizationPreferencePage.java
index 719ae31d405..7eda37e8a42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentRealizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentRealizationPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ConstraintPreferencePage.java
index 5dfbe15e6f4..76008afe195 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ConstraintPreferencePage.java
@@ -13,8 +13,8 @@
 package org.eclipse.papyrus.uml.diagram.component.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DefaultNamedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DefaultNamedElementPreferencePage.java
index 1649a634d4d..5758dfc1908 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DefaultNamedElementPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DefaultNamedElementPreferencePage.java
@@ -13,8 +13,8 @@
 package org.eclipse.papyrus.uml.diagram.component.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyLinkPreferencePage.java
index 0e1adf8d5d1..a1349566615 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyLinkPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyNodePreferencePage.java
index 2138c878582..dd8a64a5451 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyNodePreferencePage.java
@@ -13,8 +13,8 @@
 package org.eclipse.papyrus.uml.diagram.component.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/GeneralizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/GeneralizationPreferencePage.java
index 23c90404b30..30a443cbe38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/GeneralizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/GeneralizationPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePortLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePortLinkPreferencePage.java
index 41562b70b88..33e011206f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePortLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePortLinkPreferencePage.java
@@ -1,3 +1,6 @@
+/*
+ * 
+ */
 package org.eclipse.papyrus.uml.diagram.component.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePreferencePage.java
index 7c6dd3e80f0..5a60dfb862c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ManifestationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ManifestationPreferencePage.java
index 0ff452651be..e2cf55395a2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ManifestationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ManifestationPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ModelPreferencePage.java
index 37f2814779c..5e5427f4d91 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ModelPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ModelPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/NamedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/NamedElementPreferencePage.java
index 2ab0a317c67..fb33e9b122a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/NamedElementPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/NamedElementPreferencePage.java
@@ -17,8 +17,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/OperationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/OperationPreferencePage.java
index 756b6cb96ee..6baa1d89a7f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/OperationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/OperationPreferencePage.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.uml.diagram.component.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PackagePreferencePage.java
index 2b24dbecb14..72081118f93 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PackagePreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PortPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PortPreferencePage.java
index 08ee3449183..d1112b83238 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PortPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PortPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PropertyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PropertyPreferencePage.java
index 5ce51395be0..b3b59834d4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PropertyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PropertyPreferencePage.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.uml.diagram.component.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
 
@@ -45,8 +45,8 @@ public class PropertyPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		String key = ComponentDiagramEditPart.MODEL_ID + "_Property";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 150);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 70);
 		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
 		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
 		// Set the default for the gradient
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ReceptionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ReceptionPreferencePage.java
index 71d1c334491..e04f6a50ec0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ReceptionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ReceptionPreferencePage.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.uml.diagram.component.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/SubstitutionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/SubstitutionPreferencePage.java
index 9cadc5dfd8b..2261df7489e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/SubstitutionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/SubstitutionPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/ElementInitializers.java
index f5e7dc51ed5..61a4e8e3f89 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/ElementInitializers.java
@@ -222,6 +222,18 @@ public class ElementInitializers {
 	/**
 	 * @generated
 	 */
+	public void init_Property_3079(Property instance) {
+		try {
+			Object value_0 = name_Property_3079(instance);
+			instance.setName((String)value_0);
+		} catch (RuntimeException e) {
+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
+		}
+	}
+
+	/**
+	 * @generated
+	 */
 	public void init_Comment_3074(Comment instance) {
 		try {
 			Object value_0 = body_Comment_3074(instance);
@@ -479,6 +491,13 @@ public class ElementInitializers {
 	/**
 	 * @generated
 	 */
+	private String name_Property_3079(Property self) {
+		return NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());
+	}
+
+	/**
+	 * @generated
+	 */
 	private String name_Substitution_4012(Substitution self) {
 		return NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java
index 4411974f907..cab1a1c1d54 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java
@@ -54,6 +54,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;
@@ -177,6 +178,11 @@ public class UMLElementTypes {
 	/**
 	 * @generated
 	 */
+	public static final IElementType Property_3079 = getElementType("org.eclipse.papyrus.uml.diagram.component.Property_3079"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
 	public static final IElementType Comment_3074 = getElementType("org.eclipse.papyrus.uml.diagram.component.Comment_3074"); //$NON-NLS-1$
 
 	/**
@@ -323,6 +329,7 @@ public class UMLElementTypes {
 			elements.put(Operation_5, UMLPackage.eINSTANCE.getOperation());
 			elements.put(Reception_6, UMLPackage.eINSTANCE.getReception());
 			elements.put(Interface_3072, UMLPackage.eINSTANCE.getInterface());
+			elements.put(Property_3079, UMLPackage.eINSTANCE.getProperty());
 			elements.put(Usage_4001, UMLPackage.eINSTANCE.getUsage());
 			elements.put(InterfaceRealization_4006, UMLPackage.eINSTANCE.getInterfaceRealization());
 			elements.put(Generalization_4003, UMLPackage.eINSTANCE.getGeneralization());
@@ -373,6 +380,7 @@ public class UMLElementTypes {
 			KNOWN_ELEMENT_TYPES.add(Operation_5);
 			KNOWN_ELEMENT_TYPES.add(Reception_6);
 			KNOWN_ELEMENT_TYPES.add(Interface_3072);
+			KNOWN_ELEMENT_TYPES.add(Property_3079);
 			KNOWN_ELEMENT_TYPES.add(Usage_4001);
 			KNOWN_ELEMENT_TYPES.add(InterfaceRealization_4006);
 			KNOWN_ELEMENT_TYPES.add(Generalization_4003);
@@ -439,6 +447,8 @@ public class UMLElementTypes {
 			return Reception_6;
 		case InterfaceEditPartPCN.VISUAL_ID:
 			return Interface_3072;
+		case PropertyPartEditPartCN.VISUAL_ID:
+			return Property_3079;
 		case UsageEditPart.VISUAL_ID:
 			return Usage_4001;
 		case InterfaceRealizationEditPart.VISUAL_ID:
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLModelingAssistantProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLModelingAssistantProvider.java
index 39853610bb9..161a8542467 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLModelingAssistantProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLModelingAssistantProvider.java
@@ -53,6 +53,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackagePackageableElementCompartmentEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackagePackageableElementCompartmentEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.part.Messages;
@@ -114,8 +115,9 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 			return types;
 		}
 		if(editPart instanceof ComponentCompositeCompartmentEditPart) {
-			ArrayList<IElementType> types = new ArrayList<IElementType>(1);
+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);
 			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Property_3079);
 			return types;
 		}
 		if(editPart instanceof ModelPackageableElementCompartmentEditPart) {
@@ -163,13 +165,15 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 			return types;
 		}
 		if(editPart instanceof ComponentCompositeCompartmentEditPartCN) {
-			ArrayList<IElementType> types = new ArrayList<IElementType>(1);
+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);
 			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Property_3079);
 			return types;
 		}
 		if(editPart instanceof ComponentCompositeCompartmentEditPartPCN) {
-			ArrayList<IElementType> types = new ArrayList<IElementType>(1);
+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);
 			types.add(UMLElementTypes.Component_3070);
+			types.add(UMLElementTypes.Property_3079);
 			return types;
 		}
 		return Collections.EMPTY_LIST;
@@ -234,6 +238,9 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 		if(sourceEditPart instanceof InterfaceEditPartPCN) {
 			return ((InterfaceEditPartPCN)sourceEditPart).getMARelTypesOnSource();
 		}
+		if(sourceEditPart instanceof PropertyPartEditPartCN) {
+			return ((PropertyPartEditPartCN)sourceEditPart).getMARelTypesOnSource();
+		}
 		return Collections.EMPTY_LIST;
 	}
 
@@ -296,6 +303,9 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			return ((InterfaceEditPartPCN)targetEditPart).getMARelTypesOnTarget();
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			return ((PropertyPartEditPartCN)targetEditPart).getMARelTypesOnTarget();
+		}
 		return Collections.EMPTY_LIST;
 	}
 
@@ -359,6 +369,9 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 		if(sourceEditPart instanceof InterfaceEditPartPCN) {
 			return ((InterfaceEditPartPCN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);
 		}
+		if(sourceEditPart instanceof PropertyPartEditPartCN) {
+			return ((PropertyPartEditPartCN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);
+		}
 		return Collections.EMPTY_LIST;
 	}
 
@@ -421,6 +434,9 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {
 			return ((InterfaceEditPartPCN)targetEditPart).getMATypesForSource(relationshipType);
 		}
+		if(targetEditPart instanceof PropertyPartEditPartCN) {
+			return ((PropertyPartEditPartCN)targetEditPart).getMATypesForSource(relationshipType);
+		}
 		return Collections.EMPTY_LIST;
 	}
 
@@ -483,6 +499,9 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 		if(sourceEditPart instanceof InterfaceEditPartPCN) {
 			return ((InterfaceEditPartPCN)sourceEditPart).getMATypesForTarget(relationshipType);
 		}
+		if(sourceEditPart instanceof PropertyPartEditPartCN) {
+			return ((PropertyPartEditPartCN)sourceEditPart).getMATypesForTarget(relationshipType);
+		}
 		return Collections.EMPTY_LIST;
 	}
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLParserProvider.java
index e3cbb86186b..9020f2112c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLParserProvider.java
@@ -57,6 +57,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageNameEditPartC
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortAppliedStereotypeEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartNameEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceNameEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceNameEditPartCN;
@@ -380,6 +381,26 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	/**
 	 * @generated
 	 */
+	private IParser propertyName_5268Parser;
+
+	/**
+	 * @generated
+	 */
+	private IParser getPropertyName_5268Parser() {
+		if(propertyName_5268Parser == null) {
+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };
+			MessageFormatParser parser = new MessageFormatParser(features);
+			parser.setViewPattern("{0}"); //$NON-NLS-1$
+			parser.setEditorPattern("{0}"); //$NON-NLS-1$
+			parser.setEditPattern("{0}"); //$NON-NLS-1$
+			propertyName_5268Parser = parser;
+		}
+		return propertyName_5268Parser;
+	}
+
+	/**
+	 * @generated
+	 */
 	private CommentParser commentBody_5258Parser;
 
 	/**
@@ -706,6 +727,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 			return getReception_6Parser();
 		case InterfaceNameEditPartPCN.VISUAL_ID:
 			return getInterfaceName_0Parser();
+		case PropertyPartNameEditPartCN.VISUAL_ID:
+			return getPropertyName_5268Parser();
 		case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:
 			return getGeneralizationIsSubstitutable_2Parser();
 		case SubstitutionNameEditPart.VISUAL_ID:
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java
index af915a63986..4b5e6ed4c8f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java
@@ -53,8 +53,8 @@ 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.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionAppliedStereotypeEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;
@@ -125,6 +125,8 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortAppliedStereotyp
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartNameEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;
@@ -262,6 +264,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 				case PropertyForInterfaceEditPart.VISUAL_ID:
 				case OperationForInterfaceEditPart.VISUAL_ID:
 				case ReceptionInInterfaceEditPart.VISUAL_ID:
+				case PropertyPartEditPartCN.VISUAL_ID:
 				case ComponentEditPartCN.VISUAL_ID:
 				case ComponentEditPartPCN.VISUAL_ID:
 				case CommentEditPartPCN.VISUAL_ID:
@@ -276,7 +279,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 				}
 			}
 		}
-		return DependencyNodeEditPart.VISUAL_ID == visualID || ComponentEditPart.VISUAL_ID == visualID || ModelEditPart.VISUAL_ID == visualID || PackageEditPart.VISUAL_ID == visualID || RectangleInterfaceEditPart.VISUAL_ID == visualID || CommentEditPart.VISUAL_ID == visualID || ConstraintEditPart.VISUAL_ID == visualID || DefaultNamedElementEditPart.VISUAL_ID == visualID || InterfaceEditPart.VISUAL_ID == visualID || PortEditPart.VISUAL_ID == visualID || ModelEditPartCN.VISUAL_ID == visualID || PackageEditPartCN.VISUAL_ID == visualID || RectangleInterfaceEditPartCN.VISUAL_ID == visualID || ComponentEditPartCN.VISUAL_ID == visualID || ComponentEditPartPCN.VISUAL_ID == visualID || CommentEditPartPCN.VISUAL_ID == visualID || ConstraintEditPartPCN.VISUAL_ID == visualID || PropertyForInterfaceEditPart.VISUAL_ID == visualID || OperationForInterfaceEditPart.VISUAL_ID == visualID || ReceptionInInterfaceEditPart.VISUAL_ID == visualID || InterfaceEditPartPCN.VISUAL_ID == visualID;
+		return DependencyNodeEditPart.VISUAL_ID == visualID || ComponentEditPart.VISUAL_ID == visualID || ModelEditPart.VISUAL_ID == visualID || PackageEditPart.VISUAL_ID == visualID || RectangleInterfaceEditPart.VISUAL_ID == visualID || CommentEditPart.VISUAL_ID == visualID || ConstraintEditPart.VISUAL_ID == visualID || DefaultNamedElementEditPart.VISUAL_ID == visualID || InterfaceEditPart.VISUAL_ID == visualID || PortEditPart.VISUAL_ID == visualID || ModelEditPartCN.VISUAL_ID == visualID || PackageEditPartCN.VISUAL_ID == visualID || RectangleInterfaceEditPartCN.VISUAL_ID == visualID || ComponentEditPartCN.VISUAL_ID == visualID || ComponentEditPartPCN.VISUAL_ID == visualID || CommentEditPartPCN.VISUAL_ID == visualID || ConstraintEditPartPCN.VISUAL_ID == visualID || PropertyForInterfaceEditPart.VISUAL_ID == visualID || OperationForInterfaceEditPart.VISUAL_ID == visualID || ReceptionInInterfaceEditPart.VISUAL_ID == visualID || InterfaceEditPartPCN.VISUAL_ID == visualID || PropertyPartEditPartCN.VISUAL_ID == visualID;
 	}
 
 	/**
@@ -377,6 +380,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			return createReception_6(domainElement, containerView, index, persisted, preferencesHint);
 		case InterfaceEditPartPCN.VISUAL_ID:
 			return createInterface_3072(domainElement, containerView, index, persisted, preferencesHint);
+		case PropertyPartEditPartCN.VISUAL_ID:
+			return createProperty_3079(domainElement, containerView, index, persisted, preferencesHint);
 		}
 		// can't happen, provided #provides(CreateNodeViewOperation) is correct
 		return null;
@@ -762,6 +767,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**
 	 * @generated
 	 */
+	public Node createProperty_3079(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
+		Node node = NotationFactory.eINSTANCE.createShape();
+		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
+		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
+		node.setType(UMLVisualIDRegistry.getType(PropertyPartEditPartCN.VISUAL_ID));
+		ViewUtil.insertChildView(containerView, node, index, persisted);
+		node.setElement(domainElement);
+		// initializeFromPreferences 
+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Property");
+		Node label5268 = createLabel(node, UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));
+		return node;
+	}
+
+	/**
+	 * @generated
+	 */
 	public Node createComment_3074(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
 		Shape node = NotationFactory.eINSTANCE.createShape();
 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
author	ptessier	2014-01-06 10:54:29 +0000
committer	ptessier	2014-01-06 10:54:29 +0000
commit	9f2dd54ebc0ee5dbcbd0480e5daa5306787c76d8 (patch)
tree	3dc87d99c1f0e08927b4ece50d23702b529b0ee9
parent	d84e0078eda48d23a53f2f36009e2cf375f042d4 (diff)
download	org.eclipse.papyrus-9f2dd54ebc0ee5dbcbd0480e5daa5306787c76d8.tar.gz org.eclipse.papyrus-9f2dd54ebc0ee5dbcbd0480e5daa5306787c76d8.tar.xz org.eclipse.papyrus-9f2dd54ebc0ee5dbcbd0480e5daa5306787c76d8.zip