diff options
author | Mickael ADAM | 2015-10-29 16:40:41 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2016-04-26 13:51:06 +0000 |
commit | 98e0b5997caa8e85d0635d6ac8761117f00cfb38 (patch) | |
tree | 96b094a9600430499d1a486edc5bd9a060ad6f28 /plugins/uml | |
parent | 407608dc09bee90373837c06069f5ee91eb4b77c (diff) | |
download | org.eclipse.papyrus-98e0b5997caa8e85d0635d6ac8761117f00cfb38.tar.gz org.eclipse.papyrus-98e0b5997caa8e85d0635d6ac8761117f00cfb38.tar.xz org.eclipse.papyrus-98e0b5997caa8e85d0635d6ac8761117f00cfb38.zip |
Bug 480307 - [Customization] DefautElementEditPart shall support shape
customisation.
https://bugs.eclipse.org/bugs/show_bug.cgi?id=480307
Modify defalutElementEditpart to extends RoundedCompartmentEditPart and
use RoundedCompartmentFigure on:
ClassDiagram
ComponentDiagram
DeploymentDiagram
UseCaseDiagram
Change-Id: I57589db7252e0ff1c9facb2d084c8477ec7c50e4
Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>
Diffstat (limited to 'plugins/uml')
8 files changed, 35 insertions, 32 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen index 3cf337c137b..17e10d07206 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen @@ -5438,7 +5438,7 @@ editHelperClassName="DefaultNamedElementEditHelper"/> <viewmap xsi:type="gmfgen:FigureViewmap" - figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"> + figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"> <attributes xsi:type="gmfgen:DefaultSizeAttributes" width="100" @@ -8994,7 +8994,7 @@ <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="adding to manange otherNamedElement" - genView="/0/@diagram /0/@diagram/@topLevelNodes.19" + genView="/0/@diagram" name="OtherNamedElementEditPart" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/> <extensionNodes @@ -9166,7 +9166,7 @@ <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="Elements that inherits RoundedCompartmentEditPart" - genView="/0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.18 /0/@diagram/@topLevelNodes.17 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.24" + genView="/0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.18 /0/@diagram/@topLevelNodes.17 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.24 /0/@diagram/@topLevelNodes.19" name="Rounded Compartment EP inheritance" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart"/> <extensionNodes diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java index 35ddce48b02..9e82b743e1d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java @@ -32,17 +32,18 @@ import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNode import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; -import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart; +import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure; +import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure; import org.eclipse.swt.graphics.Color; /** * @generated */ -public class DefaultNamedElementEditPart extends NamedElementEditPart { +public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * @generated @@ -129,7 +130,7 @@ public class DefaultNamedElementEditPart extends NamedElementEditPart { */ @Override protected IFigure createNodeShape() { - return primaryShape = new NodeNamedElementFigure(); + return primaryShape = new RoundedCompartmentFigure(); } /** @@ -138,8 +139,8 @@ public class DefaultNamedElementEditPart extends NamedElementEditPart { * @generated */ @Override - public NodeNamedElementFigure getPrimaryShape() { - return (NodeNamedElementFigure) primaryShape; + public RoundedCompartmentFigure getPrimaryShape() { + return (RoundedCompartmentFigure) primaryShape; } /** 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 5cb9dd1759f..7be9b552354 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 @@ -1780,7 +1780,7 @@ editHelperClassName="DefaultNamedElementEditHelper"/> <viewmap xsi:type="gmfgen:FigureViewmap" - figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"> + figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"> <attributes xsi:type="gmfgen:DefaultSizeAttributes" width="100" @@ -3636,8 +3636,7 @@ superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart"/> <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" - comment="Rounded Compartment EditoPart" - genView="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@topLevelNodes.1 /0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.8 /0/@diagram/@childNodes.3 /0/@diagram/@topLevelNodes.4" + genView="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@topLevelNodes.1 /0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.8 /0/@diagram/@childNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.7" name="RoundedCompartmentEditPart" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart"/> <extensionNodes diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java index 5758670289d..cf1c1f0bdd9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java @@ -24,17 +24,18 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; +import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart; 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; import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure; +import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure; import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.ComponentDiagramChangeStereotypedShapeEditpolicy; import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry; @@ -43,7 +44,7 @@ import org.eclipse.swt.graphics.Color; /** * @generated */ -public class DefaultNamedElementEditPart extends NodeEditPart { +public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * @generated @@ -121,7 +122,7 @@ public class DefaultNamedElementEditPart extends NodeEditPart { */ @Override protected IFigure createNodeShape() { - return primaryShape = new NodeNamedElementFigure(); + return primaryShape = new RoundedCompartmentFigure(); } /** @@ -130,8 +131,8 @@ public class DefaultNamedElementEditPart extends NodeEditPart { * @generated */ @Override - public NodeNamedElementFigure getPrimaryShape() { - return (NodeNamedElementFigure) primaryShape; + public RoundedCompartmentFigure getPrimaryShape() { + return (RoundedCompartmentFigure) primaryShape; } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.gmfgen index b88bbd6bbd9..68a36bd8ddb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.gmfgen @@ -2333,7 +2333,7 @@ editHelperClassName="DefaultNamedElementEditHelper"/> <viewmap xsi:type="gmfgen:FigureViewmap" - figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"> + figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"> <attributes xsi:type="gmfgen:DefaultSizeAttributes" width="100" @@ -3677,7 +3677,7 @@ <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="adding to manange NamedElement" - genView="/0/@diagram /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.8 /0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.6 /0/@diagram/@childNodes.2 /0/@diagram/@topLevelNodes.5 /0/@diagram/@childNodes.4" + genView="/0/@diagram /0/@diagram/@topLevelNodes.8 /0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.6 /0/@diagram/@childNodes.2 /0/@diagram/@topLevelNodes.5 /0/@diagram/@childNodes.4" name="NamedElementEditPart" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/> <extensionNodes @@ -3728,7 +3728,7 @@ <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="" - genView="/0/@diagram/@topLevelNodes.7 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.8 /0/@diagram/@topLevelNodes.10 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.15" + genView="/0/@diagram/@topLevelNodes.7 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.8 /0/@diagram/@topLevelNodes.10 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.15 /0/@diagram/@topLevelNodes.9" name="RoundedCompartmentEditPart" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart"/> <extensionNodes diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementEditPart.java index a6272d69863..254ec6fec9f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementEditPart.java @@ -30,12 +30,13 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEdit import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart; +import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart; 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; import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure; +import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure; import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.DeploymentDiagramChangeStereotypedShapeEditpolicy; import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.itemsemantic.CustomDefaultNamedElementItemSemanticEditPolicy; @@ -45,7 +46,7 @@ import org.eclipse.swt.graphics.Color; /** * @generated */ -public class DefaultNamedElementEditPart extends NamedElementEditPart { +public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * @generated @@ -135,7 +136,7 @@ public class DefaultNamedElementEditPart extends NamedElementEditPart { */ @Override protected IFigure createNodeShape() { - return primaryShape = new NodeNamedElementFigure(); + return primaryShape = new RoundedCompartmentFigure(); } /** @@ -144,8 +145,8 @@ public class DefaultNamedElementEditPart extends NamedElementEditPart { * @generated */ @Override - public NodeNamedElementFigure getPrimaryShape() { - return (NodeNamedElementFigure) primaryShape; + public RoundedCompartmentFigure getPrimaryShape() { + return (RoundedCompartmentFigure) primaryShape; } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen index 36fdfb2bb7d..556014655c3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen @@ -1751,7 +1751,7 @@ editHelperClassName="DefaultNamedElementEditHelper"/> <viewmap xsi:type="gmfgen:FigureViewmap" - figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"> + figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"> <attributes xsi:type="gmfgen:DefaultSizeAttributes" width="100" @@ -3147,7 +3147,7 @@ <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="manage edit part that extends NamedElementEditPart in common" - genView="/0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.3 /0/@diagram/@childNodes.3" + genView="/0/@diagram/@topLevelNodes.3 /0/@diagram/@childNodes.3" name="NamedElementEditPart" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/> <extensionNodes @@ -3264,7 +3264,7 @@ <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="" - genView="/0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.8" + genView="/0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.8 /0/@diagram/@topLevelNodes.8" name="RoundedCompartmentEditPart" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart"/> <extensionNodes diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java index 3100d12fff6..1e141b87265 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java @@ -30,18 +30,19 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEdit import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart; +import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure; +import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure; import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; /** * @generated */ -public class DefaultNamedElementEditPartTN extends NamedElementEditPart { +public class DefaultNamedElementEditPartTN extends RoundedCompartmentEditPart { /** * @generated @@ -127,7 +128,7 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart { */ @Override protected IFigure createNodeShape() { - return primaryShape = new NodeNamedElementFigure(); + return primaryShape = new RoundedCompartmentFigure(); } /** @@ -136,8 +137,8 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart { * @generated */ @Override - public NodeNamedElementFigure getPrimaryShape() { - return (NodeNamedElementFigure) primaryShape; + public RoundedCompartmentFigure getPrimaryShape() { + return (RoundedCompartmentFigure) primaryShape; } /** |