diff options
author | jeremie.tatibouet | 2015-05-27 08:17:05 +0000 |
---|---|---|
committer | jeremie.tatibouet | 2015-05-27 09:21:37 +0000 |
commit | b9ae078da54b58d1813b3518c633d5f514523f17 (patch) | |
tree | f54ae442ef6041f27d8dd62e1d88e676296d4e66 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/UMLRepresentationKind.xmi | |
parent | 455f4aad0b34872dca6ba98c6e46f94558c917c3 (diff) | |
parent | 576f39b13f86998615aac65ab6011aa9632ab0dd (diff) | |
download | org.eclipse.papyrus-b9ae078da54b58d1813b3518c633d5f514523f17.tar.gz org.eclipse.papyrus-b9ae078da54b58d1813b3518c633d5f514523f17.tar.xz org.eclipse.papyrus-b9ae078da54b58d1813b3518c633d5f514523f17.zip |
Merge branch 'master' into bugs/462954-alf-postRC1
Conflicts:
releng/top-pom-extras.xml
Change-Id: Ia4be9916a6e59928780df709dce9741bb1ded363
Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr>
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/UMLRepresentationKind.xmi')
-rw-r--r-- | plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/UMLRepresentationKind.xmi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/UMLRepresentationKind.xmi b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/UMLRepresentationKind.xmi index c4e23f63b60..d65b25989b5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/UMLRepresentationKind.xmi +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/UMLRepresentationKind.xmi @@ -28,5 +28,13 @@ editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.BorderItemNameEditPart"
name="NameLabel for BorderItem"
viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory"/>
+ <representationkinds
+ editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ContainerNodeEditPart"
+ name="Container as a Node"
+ viewFactory="org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory"/>
+ <representationkinds
+ editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.EditableLabelForNodeEditPart"
+ name="Editable Label representing the name of a Node"
+ viewFactory="org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory"/>
</libraries>
</expansionmodel:DiagramExpansion>
|