diff options
| author | ptessier | 2012-09-13 11:56:34 +0000 |
|---|---|---|
| committer | ptessier | 2012-09-13 11:56:34 +0000 |
| commit | 588c1dc4e6daed1da13800b83288076b3141c28e (patch) | |
| tree | f89c5682e70d92433c54c836d20d52a70fd82897 | |
| parent | a16647ece0732b02c751627d27bcae4bba2ad999 (diff) | |
| download | org.eclipse.papyrus-588c1dc4e6daed1da13800b83288076b3141c28e.tar.gz org.eclipse.papyrus-588c1dc4e6daed1da13800b83288076b3141c28e.tar.xz org.eclipse.papyrus-588c1dc4e6daed1da13800b83288076b3141c28e.zip | |
358862: [class diagram] can not add reception to an interface nor component
https://bugs.eclipse.org/bugs/show_bug.cgi?id=358862
27 files changed, 1383 insertions, 108 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 68ec387ff57..32137df7742 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 @@ -890,7 +890,7 @@ canonicalEditPolicyClassName="ReceptionCanonicalEditPolicy"
graphicalNodeEditPolicyClassName="ReceptionGraphicalNodeEditPolicy"
createCommandClassName="ReceptionCreateCommand"
- containers="/0/@diagram/@compartments.17 /0/@diagram/@compartments.1"
+ containers="/0/@diagram/@compartments.17 /0/@diagram/@compartments.1 /0/@diagram/@compartments.4 /0/@diagram/@compartments.20"
labelElementIcon="true">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
@@ -929,6 +929,51 @@ </childNodes>
<childNodes
xsi:type="gmfgen:GenChildLabelNode"
+ visualID="3039"
+ editPartClassName="ReceptionInInterfaceEditPart"
+ itemSemanticEditPolicyClassName="ReceptionInInterfaceItemSemanticEditPolicy"
+ canonicalEditPolicyClassName="ReceptionInInterfaceCanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="ReceptionInInterfaceGraphicalNodeEditPolicy"
+ createCommandClassName="ReceptionInInterfaceCreateCommand"
+ containers="/0/@diagram/@compartments.8 /0/@diagram/@compartments.23"
+ labelElementIcon="true">
+ <diagramRunTimeClass
+ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+ <elementType
+ xsi:type="gmfgen:MetamodelType"
+ editHelperClassName="ReceptionEditHelper"/>
+ <viewmap
+ xsi:type="gmfgen:InnerClassViewmap"
+ className="ReceptionDescriptor"
+ classBody="
/**
 * @generated
 */
public class ReceptionDescriptor extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel {




	/**
	 * @generated
	 */
	public ReceptionDescriptor() {
				this.setText("");
	}






}

">
+ <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
+ </viewmap>
+ <modelFacet>
+ <metaClass
+ href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Reception"/>
+ <containmentMetaFeature
+ href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface/ownedReception"/>
+ <childMetaFeature
+ href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface/ownedReception"/>
+ <modelElementInitializer
+ xsi:type="gmfgen:GenFeatureSeqInitializer">
+ <initializers
+ xsi:type="gmfgen:GenFeatureValueSpec"
+ value="/0/@expressionProviders/@providers.0/@expressions.0">
+ <feature
+ href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+ </initializers>
+ </modelElementInitializer>
+ </modelFacet>
+ <labelModelFacet
+ xsi:type="gmfgen:FeatureLabelModelFacet"
+ parser="/0/@labelParsers/@implementations.1">
+ <metaFeatures
+ href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+ </labelModelFacet>
+ </childNodes>
+ <childNodes
+ xsi:type="gmfgen:GenChildLabelNode"
visualID="3030"
editPartClassName="SlotEditPart"
itemSemanticEditPolicyClassName="SlotItemSemanticEditPolicy"
@@ -975,7 +1020,7 @@ compartments="/0/@diagram/@compartments.35"
graphicalNodeEditPolicyClassName="RedefinableTemplateSignatureGraphicalNodeEditPolicy"
createCommandClassName="RedefinableTemplateSignatureCreateCommand"
- containers="/0/@diagram/@topLevelNodes.7 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.24 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.12 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.31 /0/@diagram/@topLevelNodes.6 /0/@diagram/@topLevelNodes.9 /0/@diagram/@childNodes.26 /0/@diagram/@topLevelNodes.10 /0/@diagram/@topLevelNodes.4"
+ containers="/0/@diagram/@topLevelNodes.7 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.25 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.12 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.32 /0/@diagram/@topLevelNodes.6 /0/@diagram/@topLevelNodes.9 /0/@diagram/@childNodes.27 /0/@diagram/@topLevelNodes.10 /0/@diagram/@topLevelNodes.4"
preferredSideName="EAST">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
@@ -1049,7 +1094,7 @@ compartments="/0/@diagram/@compartments.36"
graphicalNodeEditPolicyClassName="TemplateSignatureGraphicalNodeEditPolicy"
createCommandClassName="TemplateSignatureCreateCommand"
- containers="/0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.9 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.28"
+ containers="/0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.9 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.29"
preferredSideName="EAST">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
@@ -1170,7 +1215,7 @@ editPartClassName="ComponentEditPartCN"
itemSemanticEditPolicyClassName="ComponentItemSemanticEditPolicyCN"
canonicalEditPolicyClassName="ComponentCanonicalEditPolicyCN"
- childNodes="/0/@diagram/@childNodes.19"
+ childNodes="/0/@diagram/@childNodes.20"
compartments="/0/@diagram/@compartments.3 /0/@diagram/@compartments.4 /0/@diagram/@compartments.5"
graphicalNodeEditPolicyClassName="ComponentGraphicalNodeEditPolicyCN"
createCommandClassName="ComponentCreateCommandCN"
@@ -1275,7 +1320,7 @@ editPartClassName="SignalEditPartCN"
itemSemanticEditPolicyClassName="SignalItemSemanticEditPolicyCN"
canonicalEditPolicyClassName="SignalCanonicalEditPolicyCN"
- childNodes="/0/@diagram/@childNodes.19"
+ childNodes="/0/@diagram/@childNodes.20"
compartments="/0/@diagram/@compartments.6"
graphicalNodeEditPolicyClassName="SignalGraphicalNodeEditPolicyCN"
createCommandClassName="SignalCreateCommandCN"
@@ -1380,7 +1425,7 @@ editPartClassName="InterfaceEditPartCN"
itemSemanticEditPolicyClassName="InterfaceItemSemanticEditPolicyCN"
canonicalEditPolicyClassName="InterfaceCanonicalEditPolicyCN"
- childNodes="/0/@diagram/@childNodes.19"
+ childNodes="/0/@diagram/@childNodes.20"
compartments="/0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9"
graphicalNodeEditPolicyClassName="InterfaceGraphicalNodeEditPolicyCN"
createCommandClassName="InterfaceCreateCommandCN"
@@ -1481,7 +1526,7 @@ editPartClassName="ModelEditPartCN"
itemSemanticEditPolicyClassName="ModelItemSemanticEditPolicyCN"
canonicalEditPolicyClassName="ModelCanonicalEditPolicyCN"
- childNodes="/0/@diagram/@childNodes.19 /0/@diagram/@childNodes.21"
+ childNodes="/0/@diagram/@childNodes.20 /0/@diagram/@childNodes.22"
compartments="/0/@diagram/@compartments.12"
graphicalNodeEditPolicyClassName="ModelGraphicalNodeEditPolicyCN"
createCommandClassName="ModelCreateCommandCN"
@@ -1676,7 +1721,7 @@ editPartClassName="PackageEditPartCN"
itemSemanticEditPolicyClassName="PackageItemSemanticEditPolicyCN"
canonicalEditPolicyClassName="PackageCanonicalEditPolicyCN"
- childNodes="/0/@diagram/@childNodes.19 /0/@diagram/@childNodes.21"
+ childNodes="/0/@diagram/@childNodes.20 /0/@diagram/@childNodes.22"
compartments="/0/@diagram/@compartments.13"
graphicalNodeEditPolicyClassName="PackageGraphicalNodeEditPolicyCN"
createCommandClassName="PackageCreateCommandCN"
@@ -1773,7 +1818,7 @@ editPartClassName="ClassEditPartCN"
itemSemanticEditPolicyClassName="ClassItemSemanticEditPolicyCN"
canonicalEditPolicyClassName="ClassCanonicalEditPolicyCN"
- childNodes="/0/@diagram/@childNodes.19"
+ childNodes="/0/@diagram/@childNodes.20"
compartments="/0/@diagram/@compartments.0 /0/@diagram/@compartments.1 /0/@diagram/@compartments.2"
graphicalNodeEditPolicyClassName="ClassGraphicalNodeEditPolicyCN"
createCommandClassName="ClassCreateCommandCN"
@@ -1959,7 +2004,7 @@ editPartClassName="DataTypeEditPartCN"
itemSemanticEditPolicyClassName="DataTypeItemSemanticEditPolicyCN"
canonicalEditPolicyClassName="DataTypeCanonicalEditPolicyCN"
- childNodes="/0/@diagram/@childNodes.19"
+ childNodes="/0/@diagram/@childNodes.20"
compartments="/0/@diagram/@compartments.10 /0/@diagram/@compartments.11"
graphicalNodeEditPolicyClassName="DataTypeGraphicalNodeEditPolicyCN"
createCommandClassName="DataTypeCreateCommandCN"
@@ -2336,7 +2381,7 @@ xsi:type="gmfgen:SpecializationType"
uniqueIdentifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3038"
displayName="Interface"
- metamodelType="/0/@diagram/@childNodes.35/@elementType"/>
+ metamodelType="/0/@diagram/@childNodes.36/@elementType"/>
<viewmap
xsi:type="gmfgen:FigureViewmap"
figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
@@ -2654,7 +2699,7 @@ editPartClassName="ComponentEditPart"
itemSemanticEditPolicyClassName="ComponentItemSemanticEditPolicy"
canonicalEditPolicyClassName="ComponentCanonicalEditPolicy"
- childNodes="/0/@diagram/@childNodes.19"
+ childNodes="/0/@diagram/@childNodes.20"
compartments="/0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21"
graphicalNodeEditPolicyClassName="ComponentGraphicalNodeEditPolicy"
createCommandClassName="ComponentCreateCommand">
@@ -2758,7 +2803,7 @@ editPartClassName="SignalEditPart"
itemSemanticEditPolicyClassName="SignalItemSemanticEditPolicy"
canonicalEditPolicyClassName="SignalCanonicalEditPolicy"
- childNodes="/0/@diagram/@childNodes.19"
+ childNodes="/0/@diagram/@childNodes.20"
compartments="/0/@diagram/@compartments.29"
graphicalNodeEditPolicyClassName="SignalGraphicalNodeEditPolicy"
createCommandClassName="SignalCreateCommand">
@@ -2862,7 +2907,7 @@ editPartClassName="InterfaceEditPart"
itemSemanticEditPolicyClassName="InterfaceItemSemanticEditPolicy"
canonicalEditPolicyClassName="InterfaceCanonicalEditPolicy"
- childNodes="/0/@diagram/@childNodes.19"
+ childNodes="/0/@diagram/@childNodes.20"
compartments="/0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24"
graphicalNodeEditPolicyClassName="InterfaceGraphicalNodeEditPolicy"
createCommandClassName="InterfaceCreateCommand">
@@ -2958,7 +3003,7 @@ editPartClassName="ModelEditPartTN"
itemSemanticEditPolicyClassName="ModelItemSemanticEditPolicyTN"
canonicalEditPolicyClassName="ModelCanonicalEditPolicyTN"
- childNodes="/0/@diagram/@childNodes.19 /0/@diagram/@childNodes.21"
+ childNodes="/0/@diagram/@childNodes.20 /0/@diagram/@childNodes.22"
compartments="/0/@diagram/@compartments.30"
graphicalNodeEditPolicyClassName="ModelGraphicalNodeEditPolicyTN"
createCommandClassName="ModelCreateCommandTN">
@@ -3065,7 +3110,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="/0/@diagram/@childNodes.27/@elementType"/>
+ metamodelType="/0/@diagram/@childNodes.28/@elementType"/>
<viewmap
xsi:type="gmfgen:FigureViewmap"
figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure">
@@ -3151,7 +3196,7 @@ editPartClassName="PackageEditPart"
itemSemanticEditPolicyClassName="PackageItemSemanticEditPolicy"
canonicalEditPolicyClassName="PackageCanonicalEditPolicy"
- childNodes="/0/@diagram/@childNodes.19 /0/@diagram/@childNodes.21"
+ childNodes="/0/@diagram/@childNodes.20 /0/@diagram/@childNodes.22"
compartments="/0/@diagram/@compartments.31"
graphicalNodeEditPolicyClassName="PackageGraphicalNodeEditPolicy"
createCommandClassName="PackageCreateCommand">
@@ -3255,7 +3300,7 @@ editPartClassName="ClassEditPart"
itemSemanticEditPolicyClassName="ClassItemSemanticEditPolicy"
canonicalEditPolicyClassName="ClassCanonicalEditPolicy"
- childNodes="/0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20"
+ childNodes="/0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21"
compartments="/0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18"
graphicalNodeEditPolicyClassName="ClassGraphicalNodeEditPolicy"
createCommandClassName="ClassCreateCommand">
@@ -3369,7 +3414,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="/0/@diagram/@childNodes.30/@elementType"/>
+ metamodelType="/0/@diagram/@childNodes.31/@elementType"/>
<viewmap
xsi:type="gmfgen:FigureViewmap"
figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure">
@@ -3447,7 +3492,7 @@ editPartClassName="DataTypeEditPart"
itemSemanticEditPolicyClassName="DataTypeItemSemanticEditPolicy"
canonicalEditPolicyClassName="DataTypeCanonicalEditPolicy"
- childNodes="/0/@diagram/@childNodes.19"
+ childNodes="/0/@diagram/@childNodes.20"
compartments="/0/@diagram/@compartments.25 /0/@diagram/@compartments.26"
graphicalNodeEditPolicyClassName="DataTypeGraphicalNodeEditPolicy"
createCommandClassName="DataTypeCreateCommand">
@@ -3455,7 +3500,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="/0/@diagram/@childNodes.31/@elementType"/>
+ metamodelType="/0/@diagram/@childNodes.32/@elementType"/>
<viewmap
xsi:type="gmfgen:FigureViewmap"
figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure">
@@ -3555,7 +3600,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="/0/@diagram/@childNodes.33/@elementType"/>
+ metamodelType="/0/@diagram/@childNodes.34/@elementType"/>
<viewmap
xsi:type="gmfgen:FigureViewmap"
figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
@@ -3655,7 +3700,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="/0/@diagram/@childNodes.32/@elementType"/>
+ metamodelType="/0/@diagram/@childNodes.33/@elementType"/>
<viewmap
xsi:type="gmfgen:FigureViewmap"
figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>
@@ -5889,7 +5934,7 @@ canonicalEditPolicyClassName="ClassAttributeCompartmentCanonicalEditPolicyCN"
childNodes="/0/@diagram/@childNodes.0"
title="AttributeCompartment"
- node="/0/@diagram/@childNodes.29">
+ node="/0/@diagram/@childNodes.30">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -5912,7 +5957,7 @@ canonicalEditPolicyClassName="ClassOperationCompartmentCanonicalEditPolicyCN"
childNodes="/0/@diagram/@childNodes.17 /0/@diagram/@childNodes.8"
title="OperationCompartment"
- node="/0/@diagram/@childNodes.29">
+ node="/0/@diagram/@childNodes.30">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -5935,7 +5980,7 @@ canonicalEditPolicyClassName="ClassNestedClassifierCompartmentCanonicalEditPolicyCN"
childNodes="/0/@diagram/@childNodes.5"
title="NestedClassifierCompartment"
- node="/0/@diagram/@childNodes.29">
+ node="/0/@diagram/@childNodes.30">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -5962,7 +6007,7 @@ canonicalEditPolicyClassName="ComponentAttributeCompartmentCanonicalEditPolicyCN"
childNodes="/0/@diagram/@childNodes.1"
title="AttributeCompartment"
- node="/0/@diagram/@childNodes.23">
+ node="/0/@diagram/@childNodes.24">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -5983,9 +6028,9 @@ editPartClassName="ComponentOperationCompartmentEditPartCN"
itemSemanticEditPolicyClassName="ComponentOperationCompartmentItemSemanticEditPolicyCN"
canonicalEditPolicyClassName="ComponentOperationCompartmentCanonicalEditPolicyCN"
- childNodes="/0/@diagram/@childNodes.9"
+ childNodes="/0/@diagram/@childNodes.9 /0/@diagram/@childNodes.17"
title="OperationCompartment"
- node="/0/@diagram/@childNodes.23">
+ node="/0/@diagram/@childNodes.24">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -6008,7 +6053,7 @@ canonicalEditPolicyClassName="ComponentNestedClassifierCompartmentCanonicalEditPolicyCN"
childNodes="/0/@diagram/@childNodes.6"
title="NestedClassifierCompartment"
- node="/0/@diagram/@childNodes.23">
+ node="/0/@diagram/@childNodes.24">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -6035,7 +6080,7 @@ canonicalEditPolicyClassName="SignalAttributeCompartmentCanonicalEditPolicyCN"
childNodes="/0/@diagram/@childNodes.2"
title="AttributeCompartment"
- node="/0/@diagram/@childNodes.24">
+ node="/0/@diagram/@childNodes.25">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -6058,7 +6103,7 @@ canonicalEditPolicyClassName="InterfaceAttributeCompartmentCanonicalEditPolicyCN"
childNodes="/0/@diagram/@childNodes.3"
title="AttributeCompartment"
- node="/0/@diagram/@childNodes.25">
+ node="/0/@diagram/@childNodes.26">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -6079,9 +6124,9 @@ editPartClassName="InterfaceOperationCompartmentEditPartCN"
itemSemanticEditPolicyClassName="InterfaceOperationCompartmentItemSemanticEditPolicyCN"
canonicalEditPolicyClassName="InterfaceOperationCompartmentCanonicalEditPolicyCN"
- childNodes="/0/@diagram/@childNodes.10"
+ childNodes="/0/@diagram/@childNodes.10 /0/@diagram/@childNodes.18"
title="OperationCompartment"
- node="/0/@diagram/@childNodes.25">
+ node="/0/@diagram/@childNodes.26">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -6104,7 +6149,7 @@ canonicalEditPolicyClassName="InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN"
childNodes="/0/@diagram/@childNodes.7"
title="NestedClassifierCompartment"
- node="/0/@diagram/@childNodes.25">
+ node="/0/@diagram/@childNodes.26">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -6131,7 +6176,7 @@ canonicalEditPolicyClassName="DataTypeAttributeCompartmentCanonicalEditPolicyCN"
childNodes="/0/@diagram/@childNodes.4"
title="AttributeCompartment"
- node="/0/@diagram/@childNodes.31">
+ node="/0/@diagram/@childNodes.32">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -6154,7 +6199,7 @@ canonicalEditPolicyClassName="DataTypeOperationCompartmentCanonicalEditPolicyCN"
childNodes="/0/@diagram/@childNodes.11"
title="OperationCompartment"
- node="/0/@diagram/@childNodes.31">
+ node="/0/@diagram/@childNodes.32">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -6175,10 +6220,10 @@ editPartClassName="ModelPackageableElementCompartmentEditPartCN"
itemSemanticEditPolicyClassName="ModelPackageableElementCompartmentItemSemanticEditPolicyCN"
canonicalEditPolicyClassName="ModelPackageableElementCompartmentCanonicalEditPolicyCN"
- childNodes="/0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
+ childNodes="/0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.34"
title="PackageableElementCompartment"
canCollapse="false"
- node="/0/@diagram/@childNodes.26"
+ node="/0/@diagram/@childNodes.27"
listLayout="false">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
@@ -6208,10 +6253,10 @@ editPartClassName="PackagePackageableElementCompartmentEditPartCN"
itemSemanticEditPolicyClassName="PackagePackageableElementCompartmentItemSemanticEditPolicyCN"
canonicalEditPolicyClassName="PackagePackageableElementCompartmentCanonicalEditPolicyCN"
- childNodes="/0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
+ childNodes="/0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.34"
title="PackageableElementCompartment"
canCollapse="false"
- node="/0/@diagram/@childNodes.28"
+ node="/0/@diagram/@childNodes.29"
listLayout="false">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
@@ -6243,7 +6288,7 @@ canonicalEditPolicyClassName="EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN"
childNodes="/0/@diagram/@childNodes.16"
title="EnumerationLiteralCompartment"
- node="/0/@diagram/@childNodes.27">
+ node="/0/@diagram/@childNodes.28">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -6264,9 +6309,9 @@ editPartClassName="InstanceSpecificationSlotCompartmentEditPartCN"
itemSemanticEditPolicyClassName="InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN"
canonicalEditPolicyClassName="InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN"
- childNodes="/0/@diagram/@childNodes.18"
+ childNodes="/0/@diagram/@childNodes.19"
title="SlotCompartment"
- node="/0/@diagram/@childNodes.22">
+ node="/0/@diagram/@childNodes.23">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -6333,7 +6378,7 @@ editPartClassName="ClassNestedClassifierCompartmentEditPart"
itemSemanticEditPolicyClassName="ClassNestedClassifierCompartmentItemSemanticEditPolicy"
canonicalEditPolicyClassName="ClassNestedClassifierCompartmentCanonicalEditPolicy"
- childNodes="/0/@diagram/@childNodes.5 /0/@diagram/@childNodes.34"
+ childNodes="/0/@diagram/@childNodes.5 /0/@diagram/@childNodes.35"
title="NestedClassifierCompartment"
node="/0/@diagram/@topLevelNodes.10">
<diagramRunTimeClass
@@ -6387,7 +6432,7 @@ editPartClassName="ComponentOperationCompartmentEditPart"
itemSemanticEditPolicyClassName="ComponentOperationCompartmentItemSemanticEditPolicy"
canonicalEditPolicyClassName="ComponentOperationCompartmentCanonicalEditPolicy"
- childNodes="/0/@diagram/@childNodes.9"
+ childNodes="/0/@diagram/@childNodes.9 /0/@diagram/@childNodes.17"
title="OperationCompartment"
node="/0/@diagram/@topLevelNodes.4">
<diagramRunTimeClass
@@ -6410,7 +6455,7 @@ editPartClassName="ComponentNestedClassifierCompartmentEditPart"
itemSemanticEditPolicyClassName="ComponentNestedClassifierCompartmentItemSemanticEditPolicy"
canonicalEditPolicyClassName="ComponentNestedClassifierCompartmentCanonicalEditPolicy"
- childNodes="/0/@diagram/@childNodes.6 /0/@diagram/@childNodes.35"
+ childNodes="/0/@diagram/@childNodes.6 /0/@diagram/@childNodes.36"
title="NestedClassifierCompartment"
node="/0/@diagram/@topLevelNodes.4">
<diagramRunTimeClass
@@ -6464,7 +6509,7 @@ editPartClassName="InterfaceOperationCompartmentEditPart"
itemSemanticEditPolicyClassName="InterfaceOperationCompartmentItemSemanticEditPolicy"
canonicalEditPolicyClassName="InterfaceOperationCompartmentCanonicalEditPolicy"
- childNodes="/0/@diagram/@childNodes.10"
+ childNodes="/0/@diagram/@childNodes.10 /0/@diagram/@childNodes.18"
title="OperationCompartment"
node="/0/@diagram/@topLevelNodes.6">
<diagramRunTimeClass
@@ -6487,7 +6532,7 @@ editPartClassName="InterfaceNestedClassifierCompartmentEditPart"
itemSemanticEditPolicyClassName="InterfaceNestedClassifierCompartmentItemSemanticEditPolicy"
canonicalEditPolicyClassName="InterfaceNestedClassifierCompartmentCanonicalEditPolicy"
- childNodes="/0/@diagram/@childNodes.7 /0/@diagram/@childNodes.36"
+ childNodes="/0/@diagram/@childNodes.7 /0/@diagram/@childNodes.37"
title="NestedClassifierCompartment"
node="/0/@diagram/@topLevelNodes.6">
<diagramRunTimeClass
@@ -6587,7 +6632,7 @@ editPartClassName="InstanceSpecificationSlotCompartmentEditPart"
itemSemanticEditPolicyClassName="InstanceSpecificationSlotCompartmentItemSemanticEditPolicy"
canonicalEditPolicyClassName="InstanceSpecificationSlotCompartmentCanonicalEditPolicy"
- childNodes="/0/@diagram/@childNodes.18"
+ childNodes="/0/@diagram/@childNodes.19"
title="SlotCompartment"
node="/0/@diagram/@topLevelNodes.3">
<diagramRunTimeClass
@@ -6633,7 +6678,7 @@ editPartClassName="ModelPackageableElementCompartmentEditPartTN"
itemSemanticEditPolicyClassName="ModelPackageableElementCompartmentItemSemanticEditPolicyTN"
canonicalEditPolicyClassName="ModelPackageableElementCompartmentCanonicalEditPolicyTN"
- childNodes="/0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
+ childNodes="/0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.34"
title="PackageableElementCompartment"
canCollapse="false"
node="/0/@diagram/@topLevelNodes.7"
@@ -6666,7 +6711,7 @@ editPartClassName="PackagePackageableElementCompartmentEditPart"
itemSemanticEditPolicyClassName="PackagePackageableElementCompartmentItemSemanticEditPolicy"
canonicalEditPolicyClassName="PackagePackageableElementCompartmentCanonicalEditPolicy"
- childNodes="/0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
+ childNodes="/0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.34"
title="PackageableElementCompartment"
canCollapse="false"
node="/0/@diagram/@topLevelNodes.9"
@@ -6775,7 +6820,7 @@ childNodes="/0/@diagram/@childNodes.14 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.15"
title="TemplateParameterCompartment"
canCollapse="false"
- node="/0/@diagram/@childNodes.19">
+ node="/0/@diagram/@childNodes.20">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -6803,7 +6848,7 @@ childNodes="/0/@diagram/@childNodes.14 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.15"
title="TemplateParameterCompartment"
canCollapse="false"
- node="/0/@diagram/@childNodes.21">
+ node="/0/@diagram/@childNodes.22">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -6839,7 +6884,7 @@ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
id=""clazz.tool.class""
- genNodes="/0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.5 /0/@diagram/@topLevelNodes.10"/>
+ genNodes="/0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.5 /0/@diagram/@topLevelNodes.10"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="ClassifierTemplateParameter"
@@ -6856,7 +6901,7 @@ smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
createMethodName="createComment5CreationTool"
id=""clazz.tool.comment""
- genNodes="/0/@diagram/@childNodes.32 /0/@diagram/@topLevelNodes.14"/>
+ genNodes="/0/@diagram/@childNodes.33 /0/@diagram/@topLevelNodes.14"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Component"
@@ -6864,7 +6909,7 @@ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"
smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"
id=""clazz.tool.component""
- genNodes="/0/@diagram/@topLevelNodes.4 /0/@diagram/@childNodes.23"/>
+ genNodes="/0/@diagram/@topLevelNodes.4 /0/@diagram/@childNodes.24"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Constraint"
@@ -6872,7 +6917,7 @@ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
id=""clazz.tool.constraint""
- genNodes="/0/@diagram/@childNodes.33 /0/@diagram/@topLevelNodes.13"/>
+ genNodes="/0/@diagram/@childNodes.34 /0/@diagram/@topLevelNodes.13"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="DataType"
@@ -6880,7 +6925,7 @@ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif"
smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif"
id=""clazz.tool.datatype""
- genNodes="/0/@diagram/@childNodes.31 /0/@diagram/@topLevelNodes.12"/>
+ genNodes="/0/@diagram/@childNodes.32 /0/@diagram/@topLevelNodes.12"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="DurationObservation"
@@ -6895,7 +6940,7 @@ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif"
smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif"
id=""clazz.tool.enumeration""
- genNodes="/0/@diagram/@childNodes.27 /0/@diagram/@topLevelNodes.8"/>
+ genNodes="/0/@diagram/@childNodes.28 /0/@diagram/@topLevelNodes.8"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Enumeration literal"
@@ -6911,7 +6956,7 @@ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
id=""clazz.tool.interface""
- genNodes="/0/@diagram/@topLevelNodes.6 /0/@diagram/@childNodes.25"/>
+ genNodes="/0/@diagram/@topLevelNodes.6 /0/@diagram/@childNodes.26"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="InstanceSpecification"
@@ -6919,7 +6964,7 @@ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif"
smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif"
id=""clazz.tool.instancespecification""
- genNodes="/0/@diagram/@topLevelNodes.3 /0/@diagram/@childNodes.22"/>
+ genNodes="/0/@diagram/@topLevelNodes.3 /0/@diagram/@childNodes.23"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="PrimitiveType"
@@ -6927,7 +6972,7 @@ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif"
smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif"
id=""clazz.tool.primitivetype""
- genNodes="/0/@diagram/@childNodes.30 /0/@diagram/@topLevelNodes.11"/>
+ genNodes="/0/@diagram/@childNodes.31 /0/@diagram/@topLevelNodes.11"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Model"
@@ -6935,7 +6980,7 @@ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"
smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"
id=""clazz.tool.model""
- genNodes="/0/@diagram/@topLevelNodes.7 /0/@diagram/@childNodes.26"/>
+ genNodes="/0/@diagram/@topLevelNodes.7 /0/@diagram/@childNodes.27"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Operation"
@@ -6960,7 +7005,7 @@ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
id=""clazz.tool.package""
- genNodes="/0/@diagram/@childNodes.28 /0/@diagram/@topLevelNodes.9"/>
+ genNodes="/0/@diagram/@childNodes.29 /0/@diagram/@topLevelNodes.9"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Property"
@@ -6976,7 +7021,7 @@ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"
smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"
id=""clazz.tool.reception""
- genNodes="/0/@diagram/@childNodes.17"/>
+ genNodes="/0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="RedefinableTemplateSignature"
@@ -6984,7 +7029,7 @@ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RedefinableTemplateSignature.gif"
smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RedefinableTemplateSignature.gif"
id=""clazz.tool.redefinabletemplatesignature""
- genNodes="/0/@diagram/@childNodes.19"/>
+ genNodes="/0/@diagram/@childNodes.20"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Signal"
@@ -6992,7 +7037,7 @@ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif"
smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif"
id=""clazz.tool.signal""
- genNodes="/0/@diagram/@topLevelNodes.5 /0/@diagram/@childNodes.24"/>
+ genNodes="/0/@diagram/@topLevelNodes.5 /0/@diagram/@childNodes.25"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Slot"
@@ -7000,7 +7045,7 @@ largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif"
smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif"
id=""clazz.tool.slot""
- genNodes="/0/@diagram/@childNodes.18"/>
+ genNodes="/0/@diagram/@childNodes.19"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="TemplateParameter"
@@ -7017,7 +7062,7 @@ smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateSignature.gif"
createMethodName="createTemplateSignatureCreationTool"
id=""clazz.tool.templatesignature""
- genNodes="/0/@diagram/@childNodes.21"/>
+ genNodes="/0/@diagram/@childNodes.22"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="TimeObservation"
@@ -7241,7 +7286,7 @@ <plugin
iD="org.eclipse.papyrus.uml.diagram.clazz"
name="PapyrusUMLClassDiagram"
- version="0.9.0.qualifier"/>
+ version="0.9.1.qualifier"/>
<editor/>
<navigator/>
<diagramUpdater/>
@@ -7303,7 +7348,7 @@ uses="/0/@diagram/@links.3/@labels.0/@modelFacet /0/@diagram/@childNodes.0/@labelModelFacet /0/@diagram/@childNodes.8/@labelModelFacet"/>
<implementations
xsi:type="gmfgen:PredefinedParser"
- uses="/0/@diagram/@childNodes.1/@labelModelFacet /0/@diagram/@childNodes.9/@labelModelFacet /0/@diagram/@childNodes.6/@labelModelFacet /0/@diagram/@childNodes.2/@labelModelFacet /0/@diagram/@childNodes.3/@labelModelFacet /0/@diagram/@childNodes.10/@labelModelFacet /0/@diagram/@childNodes.7/@labelModelFacet /0/@diagram/@childNodes.16/@labelModelFacet /0/@diagram/@childNodes.17/@labelModelFacet /0/@diagram/@childNodes.5/@labelModelFacet /0/@diagram/@childNodes.4/@labelModelFacet /0/@diagram/@childNodes.11/@labelModelFacet /0/@diagram/@childNodes.22/@labels.0/@modelFacet /0/@diagram/@childNodes.23/@labels.0/@modelFacet /0/@diagram/@childNodes.24/@labels.0/@modelFacet /0/@diagram/@childNodes.25/@labels.0/@modelFacet /0/@diagram/@childNodes.26/@labels.0/@modelFacet /0/@diagram/@childNodes.27/@labels.0/@modelFacet /0/@diagram/@childNodes.28/@labels.0/@modelFacet /0/@diagram/@childNodes.29/@labels.0/@modelFacet /0/@diagram/@childNodes.30/@labels.0/@modelFacet /0/@diagram/@childNodes.31/@labels.0/@modelFacet /0/@diagram/@childNodes.33/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.5/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.9/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.10/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.11/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.12/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.13/@labels.0/@modelFacet /0/@diagram/@links.2/@labels.1/@modelFacet /0/@diagram/@links.2/@labels.2/@modelFacet /0/@diagram/@links.2/@labels.3/@modelFacet /0/@diagram/@links.4/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.6/@labels.1/@modelFacet /0/@diagram/@links.7/@labels.1/@modelFacet /0/@diagram/@links.8/@labels.0/@modelFacet /0/@diagram/@links.9/@labels.0/@modelFacet /0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@links.12/@labels.0/@modelFacet /0/@diagram/@links.1/@labels.1/@modelFacet /0/@diagram/@links.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.16/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.17/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.18/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.19/@labels.0/@modelFacet /0/@diagram/@links.2/@labels.4/@modelFacet /0/@diagram/@links.2/@labels.5/@modelFacet /0/@diagram/@links.3/@labels.1/@modelFacet /0/@diagram/@childNodes.34/@labelModelFacet /0/@diagram/@childNodes.35/@labelModelFacet /0/@diagram/@childNodes.36/@labelModelFacet"/>
+ uses="/0/@diagram/@childNodes.1/@labelModelFacet /0/@diagram/@childNodes.9/@labelModelFacet /0/@diagram/@childNodes.6/@labelModelFacet /0/@diagram/@childNodes.2/@labelModelFacet /0/@diagram/@childNodes.3/@labelModelFacet /0/@diagram/@childNodes.10/@labelModelFacet /0/@diagram/@childNodes.7/@labelModelFacet /0/@diagram/@childNodes.16/@labelModelFacet /0/@diagram/@childNodes.17/@labelModelFacet /0/@diagram/@childNodes.5/@labelModelFacet /0/@diagram/@childNodes.4/@labelModelFacet /0/@diagram/@childNodes.11/@labelModelFacet /0/@diagram/@childNodes.23/@labels.0/@modelFacet /0/@diagram/@childNodes.24/@labels.0/@modelFacet /0/@diagram/@childNodes.25/@labels.0/@modelFacet /0/@diagram/@childNodes.26/@labels.0/@modelFacet /0/@diagram/@childNodes.27/@labels.0/@modelFacet /0/@diagram/@childNodes.28/@labels.0/@modelFacet /0/@diagram/@childNodes.29/@labels.0/@modelFacet /0/@diagram/@childNodes.30/@labels.0/@modelFacet /0/@diagram/@childNodes.31/@labels.0/@modelFacet /0/@diagram/@childNodes.32/@labels.0/@modelFacet /0/@diagram/@childNodes.34/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.5/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.9/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.10/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.11/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.12/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.13/@labels.0/@modelFacet /0/@diagram/@links.2/@labels.1/@modelFacet /0/@diagram/@links.2/@labels.2/@modelFacet /0/@diagram/@links.2/@labels.3/@modelFacet /0/@diagram/@links.4/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.6/@labels.1/@modelFacet /0/@diagram/@links.7/@labels.1/@modelFacet /0/@diagram/@links.8/@labels.0/@modelFacet /0/@diagram/@links.9/@labels.0/@modelFacet /0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@links.12/@labels.0/@modelFacet /0/@diagram/@links.1/@labels.1/@modelFacet /0/@diagram/@links.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.16/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.17/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.18/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.19/@labels.0/@modelFacet /0/@diagram/@links.2/@labels.4/@modelFacet /0/@diagram/@links.2/@labels.5/@modelFacet /0/@diagram/@links.3/@labels.1/@modelFacet /0/@diagram/@childNodes.35/@labelModelFacet /0/@diagram/@childNodes.36/@labelModelFacet /0/@diagram/@childNodes.37/@labelModelFacet /0/@diagram/@childNodes.18/@labelModelFacet"/>
<implementations
xsi:type="gmfgen:CustomParser"
uses="/0/@diagram/@links.19/@labels.0/@modelFacet"
@@ -7318,7 +7363,7 @@ qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.packageimport.PackageImportVisibilityParser"/>
<implementations
xsi:type="gmfgen:CustomParser"
- uses="/0/@diagram/@childNodes.18/@labelModelFacet"
+ uses="/0/@diagram/@childNodes.19/@labelModelFacet"
qualifiedName="org.eclipse.papyrus.uml.diagram.clazz.custom.parsers.SlotParser"/>
<implementations
xsi:type="gmfgen:CustomParser"
@@ -7326,11 +7371,11 @@ qualifiedName="org.eclipse.papyrus.uml.diagram.clazz.custom.parsers.TemplateParameterParser"/>
<implementations
xsi:type="gmfgen:CustomParser"
- uses="/0/@diagram/@childNodes.32/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.14/@labels.0/@modelFacet"
+ uses="/0/@diagram/@childNodes.33/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.14/@labels.0/@modelFacet"
qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.CommentParser"/>
<implementations
xsi:type="gmfgen:CustomParser"
- uses="/0/@diagram/@topLevelNodes.13/@labels.1/@modelFacet /0/@diagram/@childNodes.33/@labels.1/@modelFacet"
+ uses="/0/@diagram/@topLevelNodes.13/@labels.1/@modelFacet /0/@diagram/@childNodes.34/@labels.1/@modelFacet"
qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser"/>
<implementations
xsi:type="gmfgen:CustomParser"
@@ -7363,7 +7408,7 @@ <extensionNodes
xsi:type="papyrusgmfgenextension:ExtendedGenView"
comment="Manage the class"
- genView="/0/@diagram/@childNodes.29 /0/@diagram/@topLevelNodes.10"
+ genView="/0/@diagram/@childNodes.30 /0/@diagram/@topLevelNodes.10"
name="Extended class editpart"
superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart">
<propRefreshHook
@@ -7375,18 +7420,18 @@ <extensionNodes
xsi:type="papyrusgmfgenextension:ExtendedGenView"
comment="Elements that inherits Classifier"
- genView="/0/@diagram/@childNodes.30 /0/@diagram/@childNodes.23 /0/@diagram/@topLevelNodes.11 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.27 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.12 /0/@diagram/@childNodes.31 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.1"
+ genView="/0/@diagram/@childNodes.31 /0/@diagram/@childNodes.24 /0/@diagram/@topLevelNodes.11 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.28 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.12 /0/@diagram/@childNodes.32 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.1"
name="Classifier inheritance"
superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart"/>
<extensionNodes
xsi:type="papyrusgmfgenextension:SpecificLocator"
comment="precise the locator for a template signature"
classpath="org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator"
- genChildSideAffixedNode="/0/@diagram/@childNodes.19"/>
+ genChildSideAffixedNode="/0/@diagram/@childNodes.20"/>
<extensionNodes
xsi:type="papyrusgmfgenextension:ExtendedGenView"
comment="adding to manange otherNamedElement"
- genView="/0/@diagram/@childNodes.22 /0/@diagram/@topLevelNodes.3 /0/@diagram/@childNodes.28 /0/@diagram/@topLevelNodes.9 /0/@diagram /0/@diagram/@childNodes.26 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.18"
+ genView="/0/@diagram/@childNodes.23 /0/@diagram/@topLevelNodes.3 /0/@diagram/@childNodes.29 /0/@diagram/@topLevelNodes.9 /0/@diagram /0/@diagram/@childNodes.27 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.18"
name="OtherNamedElementEditPart"
superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/>
<extensionNodes
@@ -7428,7 +7473,7 @@ <extensionNodes
xsi:type="papyrusgmfgenextension:ExtendedGenView"
comment="ensure the refresh of the figure"
- genView="/0/@diagram/@childNodes.19"
+ genView="/0/@diagram/@childNodes.20"
name="AbstractRedefinableTemplateSignatureEditPart"
superOwnedEditPart="org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractRedefinableTemplateSignatureEditPart"/>
<extensionNodes
@@ -7446,23 +7491,23 @@ xsi:type="papyrusgmfgenextension:SpecificLocator"
comment="Affixed Containment locator"
classpath="org.eclipse.papyrus.uml.diagram.clazz.custom.locator.ContainmentPositionLocator"
- genChildSideAffixedNode="/0/@diagram/@childNodes.20"/>
+ genChildSideAffixedNode="/0/@diagram/@childNodes.21"/>
<extensionNodes
xsi:type="papyrusgmfgenextension:ExtendedGenView"
comment="With the mecanism of around, the methods hasborderItems(self) is never call on the template. To have the right superclass, we declare it here."
- genView="/0/@diagram/@childNodes.20"
+ genView="/0/@diagram/@childNodes.21"
name="AbstractBorderItemEditPart"
superOwnedEditPart="org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart"/>
<extensionNodes
xsi:type="papyrusgmfgenextension:ExtendedGenView"
comment="this is an extension to manage the comment"
- genView="/0/@diagram/@childNodes.32 /0/@diagram/@topLevelNodes.14"
+ genView="/0/@diagram/@childNodes.33 /0/@diagram/@topLevelNodes.14"
name="comment extended node"
superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart"/>
<extensionNodes
xsi:type="papyrusgmfgenextension:ExtendedGenView"
comment="this is an extension for constraint "
- genView="/0/@diagram/@childNodes.33 /0/@diagram/@topLevelNodes.13"
+ genView="/0/@diagram/@childNodes.34 /0/@diagram/@topLevelNodes.13"
name="ConstraintEditPart extension"
superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart"/>
<extensionNodes
@@ -7480,19 +7525,19 @@ <extensionNodes
xsi:type="papyrusgmfgenextension:ExtendedGenView"
comment="Extended Gen View For UML compartments child label nodes, like properties in classifier representation of class diagram"
- genView="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.0 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.18"
+ genView="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.0 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.19"
name="UMLCompartmentEditPart"
superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart"/>
<extensionNodes
xsi:type="papyrusgmfgenextension:SpecificLocator"
comment="precise the locator for a template signature"
classpath="org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator"
- genChildSideAffixedNode="/0/@diagram/@childNodes.21"/>
+ genChildSideAffixedNode="/0/@diagram/@childNodes.22"/>
<extensionNodes
xsi:type="papyrusgmfgenextension:EditPartUsingDeleteService"
comment="List of editpart using the delete service"
name="DeleteService editpart List"
- genView="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.0 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.21 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.10 /0/@diagram/@topLevelNodes.11 /0/@diagram/@topLevelNodes.12 /0/@diagram/@topLevelNodes.13 /0/@diagram/@topLevelNodes.14 /0/@diagram/@topLevelNodes.15 /0/@diagram/@topLevelNodes.16 /0/@diagram/@topLevelNodes.17 /0/@diagram/@topLevelNodes.18 /0/@diagram/@topLevelNodes.19 /0/@diagram/@links.0 /0/@diagram/@links.1 /0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.7 /0/@diagram/@links.8 /0/@diagram/@links.9 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.12 /0/@diagram/@links.13 /0/@diagram/@links.14 /0/@diagram/@links.15 /0/@diagram/@links.16 /0/@diagram/@links.17 /0/@diagram/@links.18 /0/@diagram/@links.19 /0/@diagram/@links.20 /0/@diagram/@links.21 /0/@diagram/@links.23 /0/@diagram/@links.24"/>
+ genView="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.0 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.34 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.22 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.10 /0/@diagram/@topLevelNodes.11 /0/@diagram/@topLevelNodes.12 /0/@diagram/@topLevelNodes.13 /0/@diagram/@topLevelNodes.14 /0/@diagram/@topLevelNodes.15 /0/@diagram/@topLevelNodes.16 /0/@diagram/@topLevelNodes.17 /0/@diagram/@topLevelNodes.18 /0/@diagram/@topLevelNodes.19 /0/@diagram/@links.0 /0/@diagram/@links.1 /0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.7 /0/@diagram/@links.8 /0/@diagram/@links.9 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.12 /0/@diagram/@links.13 /0/@diagram/@links.14 /0/@diagram/@links.15 /0/@diagram/@links.16 /0/@diagram/@links.17 /0/@diagram/@links.18 /0/@diagram/@links.19 /0/@diagram/@links.20 /0/@diagram/@links.21 /0/@diagram/@links.23 /0/@diagram/@links.24"/>
<extensionNodes
xsi:type="papyrusgmfgenextension:EditPartUsingReorientService"
comment="use the reorient service for Generalization"
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.properties index f4fb597aac9..c1fc78aba5e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.properties +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.properties @@ -131,3 +131,4 @@ metatype.name.Link_4022=ContainmentSubLink metatype.name.Interface_3036=Interface metatype.name.Interface_3037=Interface metatype.name.Interface_3038=Interface +metatype.name.Reception_3039=Reception diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml index 41c2572be34..bc45afa0ab5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml @@ -81,7 +81,7 @@ <viewProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider"> <Priority name="Lowest"/> <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLClassDiagram"/> - <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2014,2013,2015,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2016,2095,2096,2097,2098,3012,3002,3005,3006,3018,3014,3004,3008,3013,3003,3007,3019,3034,3035,3031,3016,3017,3011,3030,3015,3032,3033,3020,3021,3022,3023,3024,3025,3009,3010,3026,3027,3028,3029,3036,3037,3038"/> + <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2014,2013,2015,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2016,2095,2096,2097,2098,3012,3002,3005,3006,3018,3014,3004,3008,3013,3003,3007,3019,3034,3035,3031,3016,3017,3011,3039,3030,3015,3032,3033,3020,3021,3022,3023,3024,3025,3009,3010,3026,3027,3028,3029,3036,3037,3038"/> <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4016,4017,4001,4019,4002,4003,4004,4005,4006,4007,4008,4018,4009,4010,4011,4012,4013,4014,4015,4020,4021,4022,4023,4024,4025"/> </viewProvider> </extension> @@ -93,7 +93,7 @@ <method name="getType()" value="PapyrusUMLClassDiagram"/> </object> <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes"> - <method name="getType()" value="2014,2013,2015,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2016,2095,2096,2097,2098,3012,3002,3005,3006,3018,3014,3004,3008,3013,3003,3007,3019,3034,3035,3031,3016,3017,3011,3030,3015,3032,3033,3020,3021,3022,3023,3024,3025,3009,3010,3026,3027,3028,3029,3036,3037,3038"/> + <method name="getType()" value="2014,2013,2015,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2016,2095,2096,2097,2098,3012,3002,3005,3006,3018,3014,3004,3008,3013,3003,3007,3019,3034,3035,3031,3016,3017,3011,3039,3030,3015,3032,3033,3020,3021,3022,3023,3024,3025,3009,3010,3026,3027,3028,3029,3036,3037,3038"/> </object> <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links"> <method name="getType()" value="4016,4017,4001,4019,4002,4003,4004,4005,4006,4007,4008,4018,4009,4010,4011,4012,4013,4014,4015,4020,4021,4022,4023,4024,4025"/> @@ -150,6 +150,7 @@ <object class="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateParameterEditPart" id="TemplateParameter_3016"/> <object class="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationLiteralEditPart" id="EnumerationLiteral_3017"/> <object class="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart" id="Reception_3011"/> + <object class="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionInInterfaceEditPart" id="Reception_3039"/> <object class="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SlotEditPart" id="Slot_3030"/> <object class="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart" id="RedefinableTemplateSignature_3015"/> <object class="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContainmentCircleEditPart" id="Node_3032"/> @@ -169,7 +170,7 @@ <object class="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForClassEditPart" id="Interface_3036"/> <object class="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForComponentEditPart" id="Interface_3037"/> <object class="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForInterfaceEditPart" id="Interface_3038"/> - <context elements="Package_1000,Dependency_2014,AssociationClass_2013,Association_2015,InstanceSpecification_2001,Component_2002,Signal_2003,Interface_2004,Model_2005,Enumeration_2006,Package_2007,Class_2008,PrimitiveType_2009,DataType_2010,Constraint_2011,Comment_2012,Diagram_2016,DurationObservation_2095,TimeObservation_2096,NamedElement_2097,NamedElement_2098,Property_3012,Property_3002,Property_3005,Property_3006,Property_3018,Class_3014,Class_3004,Class_3008,Operation_3013,Operation_3003,Operation_3007,Operation_3019,ConnectableElementTemplateParameter_3034,OperationTemplateParameter_3035,ClassifierTemplateParameter_3031,TemplateParameter_3016,EnumerationLiteral_3017,Reception_3011,Slot_3030,RedefinableTemplateSignature_3015,Node_3032,TemplateSignature_3033,InstanceSpecification_3020,Component_3021,Signal_3022,Interface_3023,Model_3024,Enumeration_3025,Package_3009,Class_3010,PrimitiveType_3026,DataType_3027,Comment_3028,Constraint_3029,Interface_3036,Interface_3037,Interface_3038"/> + <context elements="Package_1000,Dependency_2014,AssociationClass_2013,Association_2015,InstanceSpecification_2001,Component_2002,Signal_2003,Interface_2004,Model_2005,Enumeration_2006,Package_2007,Class_2008,PrimitiveType_2009,DataType_2010,Constraint_2011,Comment_2012,Diagram_2016,DurationObservation_2095,TimeObservation_2096,NamedElement_2097,NamedElement_2098,Property_3012,Property_3002,Property_3005,Property_3006,Property_3018,Class_3014,Class_3004,Class_3008,Operation_3013,Operation_3003,Operation_3007,Operation_3019,ConnectableElementTemplateParameter_3034,OperationTemplateParameter_3035,ClassifierTemplateParameter_3031,TemplateParameter_3016,EnumerationLiteral_3017,Reception_3011,Reception_3039,Slot_3030,RedefinableTemplateSignature_3015,Node_3032,TemplateSignature_3033,InstanceSpecification_3020,Component_3021,Signal_3022,Interface_3023,Model_3024,Enumeration_3025,Package_3009,Class_3010,PrimitiveType_3026,DataType_3027,Comment_3028,Constraint_3029,Interface_3036,Interface_3037,Interface_3038"/> </modelingAssistantProvider> </extension> <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider"> @@ -562,6 +563,16 @@ </metamodel> <metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML"> <metamodelType + id="org.eclipse.papyrus.uml.diagram.clazz.Reception_3039" + name="%metatype.name.Reception_3039" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" + eclass="Reception" + edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ReceptionEditHelper"> + <param name="semanticHint" value="3039"/> + </metamodelType> + </metamodel> + <metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML"> + <metamodelType id="org.eclipse.papyrus.uml.diagram.clazz.Slot_3030" name="%metatype.name.Slot_3030" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" @@ -1020,6 +1031,7 @@ <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.TemplateParameter_3016"/> <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.EnumerationLiteral_3017"/> <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Reception_3011"/> + <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Reception_3039"/> <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Slot_3030"/> <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.RedefinableTemplateSignature_3015"/> <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ContainmentCircle_3032"/> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ReceptionInInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ReceptionInInterfaceCreateCommand.java new file mode 100644 index 00000000000..2085f212fc5 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ReceptionInInterfaceCreateCommand.java @@ -0,0 +1,119 @@ +/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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) Patrick.tessier@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.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.clazz.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Interface;
+import org.eclipse.uml2.uml.Reception;
+import org.eclipse.uml2.uml.UMLFactory;
+
+/**
+ * @generated
+ */
+public class ReceptionInInterfaceCreateCommand extends EditElementCommand {
+
+ /**
+ * @generated
+ */
+ private EClass eClass = null;
+
+ /**
+ * @generated
+ */
+ private EObject eObject = null;
+
+ /**
+ * @generated
+ */
+ public ReceptionInInterfaceCreateCommand(CreateElementRequest req, EObject eObject) {
+ super(req.getLabel(), null, req);
+ this.eObject = eObject;
+ this.eClass = eObject != null ? eObject.eClass() : null;
+ }
+
+ /**
+ * @generated
+ */
+ public static ReceptionInInterfaceCreateCommand create(CreateElementRequest req, EObject eObject) {
+ return new ReceptionInInterfaceCreateCommand(req, eObject);
+ }
+
+ /**
+ * @generated
+ */
+ public ReceptionInInterfaceCreateCommand(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 {
+ Reception newElement = UMLFactory.eINSTANCE.createReception();
+ Interface owner = (Interface)getElementToEdit();
+ owner.getOwnedReceptions().add(newElement);
+ ElementInitializers.getInstance().init_Reception_3039(newElement);
+ doConfigure(newElement, monitor, info);
+ ((CreateElementRequest)getRequest()).setNewElement(newElement);
+ return CommandResult.newOKCommandResult(newElement);
+ }
+
+ /**
+ * @generated
+ */
+ protected void doConfigure(Reception newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();
+ ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+ configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());
+ configureRequest.addParameters(getRequest().getParameters());
+ ICommand configureCommand = elementType.getEditCommand(configureRequest);
+ if(configureCommand != null && configureCommand.canExecute()) {
+ configureCommand.execute(monitor, info);
+ }
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java index bd2a772519d..6b509734e6c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java @@ -1892,6 +1892,9 @@ public class ComponentEditPart extends ClassifierEditPart { if(type == UMLElementTypes.Operation_3003) {
return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPart.VISUAL_ID));
}
+ if(type == UMLElementTypes.Reception_3011) {
+ return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPart.VISUAL_ID));
+ }
if(type == UMLElementTypes.Class_3004) {
return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID));
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java index 63bcb41f9e8..7b939c068fc 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java @@ -1892,6 +1892,9 @@ public class ComponentEditPartCN extends ClassifierEditPart { if(type == UMLElementTypes.Operation_3003) {
return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPartCN.VISUAL_ID));
}
+ if(type == UMLElementTypes.Reception_3011) {
+ return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPartCN.VISUAL_ID));
+ }
if(type == UMLElementTypes.Class_3004) {
return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID));
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java index 0a8b34633ca..ea0d2f3e62d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java @@ -1885,6 +1885,9 @@ public class InterfaceEditPart extends ClassifierEditPart { if(type == UMLElementTypes.Operation_3007) {
return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID));
}
+ if(type == UMLElementTypes.Reception_3039) {
+ return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID));
+ }
if(type == UMLElementTypes.Class_3008) {
return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID));
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java index cb33950220b..2c358b1fcd4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java @@ -1887,6 +1887,9 @@ public class InterfaceEditPartCN extends ClassifierEditPart { if(type == UMLElementTypes.Operation_3007) {
return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID));
}
+ if(type == UMLElementTypes.Reception_3039) {
+ return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID));
+ }
if(type == UMLElementTypes.Class_3008) {
return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID));
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionInInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionInInterfaceEditPart.java new file mode 100644 index 00000000000..deb08afb4d4 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionInInterfaceEditPart.java @@ -0,0 +1,779 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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) Patrick.tessier@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.DragTracker;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.requests.SelectionRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.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.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ReceptionInInterfaceItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * @generated
+ */
+public class ReceptionInInterfaceEditPart extends CompartmentEditPart implements ITextAwareEditPart, IPrimaryEditPart {
+
+ /**
+ * @generated
+ */
+ public static final int VISUAL_ID = 3039;
+
+ /**
+ * @generated
+ */
+ private DirectEditManager manager;
+
+ /**
+ * @generated
+ */
+ private IParser parser;
+
+ /**
+ * @generated
+ */
+ private List<?> parserElements;
+
+ /**
+ * @generated
+ */
+ private String defaultText;
+
+ /**
+ * direct edition mode (default, undefined, registered editor, etc.)
+ *
+ * @generated
+ */
+ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+ /**
+ * configuration from a registered edit dialog
+ *
+ * @generated
+ */
+ protected IDirectEditorConfiguration configuration;
+
+ /**
+ * @generated
+ */
+ public ReceptionInInterfaceEditPart(View view) {
+ super(view);
+ }
+
+ /**
+ * @generated
+ */
+ public DragTracker getDragTracker(Request request) {
+ if(request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) {
+ return null;
+ }
+ return new DragEditPartsTrackerEx(this);
+ }
+
+ /**
+ * @generated
+ */
+ protected void createDefaultEditPolicies() {
+ super.createDefaultEditPolicies();
+ installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ReceptionInInterfaceItemSemanticEditPolicy());
+ installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());
+ installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());
+ installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+ }
+
+ /**
+ * @generated
+ */
+ protected String getLabelTextHelper(IFigure figure) {
+ if(figure instanceof WrappingLabel) {
+ return ((WrappingLabel)figure).getText();
+ } else if(figure instanceof ILabelFigure) {
+ return ((ILabelFigure)figure).getText();
+ } else {
+ return ((Label)figure).getText();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setLabelTextHelper(IFigure figure, String text) {
+ if(figure instanceof WrappingLabel) {
+ ((WrappingLabel)figure).setText(text);
+ } else if(figure instanceof ILabelFigure) {
+ ((ILabelFigure)figure).setText(text);
+ } else {
+ ((Label)figure).setText(text);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected Image getLabelIconHelper(IFigure figure) {
+ if(figure instanceof WrappingLabel) {
+ return ((WrappingLabel)figure).getIcon();
+ } else if(figure instanceof ILabelFigure) {
+ return ((ILabelFigure)figure).getIcon();
+ } else {
+ return ((Label)figure).getIcon();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setLabelIconHelper(IFigure figure, Image icon) {
+ if(figure instanceof WrappingLabel) {
+ ((WrappingLabel)figure).setIcon(icon);
+ } else if(figure instanceof ILabelFigure) {
+ ((ILabelFigure)figure).setIcon(icon);
+ } else {
+ ((Label)figure).setIcon(icon);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ public void setLabel(IFigure figure) {
+ unregisterVisuals();
+ setFigure(figure);
+ defaultText = getLabelTextHelper(figure);
+ registerVisuals();
+ refreshVisuals();
+ }
+
+ /**
+ * @generated
+ */
+ protected List getModelChildren() {
+ return Collections.EMPTY_LIST;
+ }
+
+ /**
+ * @generated
+ */
+ public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ 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.Reception_3039, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionInInterfaceEditPart.VISUAL_ID));
+ }
+ return parser;
+ }
+
+ /**
+ * @generated
+ */
+ protected DirectEditManager getManager() {
+ if(manager == null) {
+ setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));
+ }
+ return manager;
+ }
+
+ /**
+ * @generated
+ */
+ protected void setManager(DirectEditManager manager) {
+ this.manager = manager;
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEdit() {
+ getManager().show();
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEdit(Point eventLocation) {
+ if(getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());
+ }
+ }
+
+ /**
+ * @generated
+ */
+ private void performDirectEdit(char initialCharacter) {
+ if(getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager)getManager()).show(initialCharacter);
+ } else {
+ performDirectEdit();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEditRequest(Request request) {
+ final Request theRequest = request;
+ if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+ directEditionMode = getDirectEditionType();
+ }
+ switch(directEditionMode) {
+ case IDirectEdition.NO_DIRECT_EDITION:
+ // no direct edition mode => does nothing
+ return;
+ case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+ updateExtendedEditorConfiguration();
+ if(configuration == null || configuration.getLanguage() == null) {
+ performDefaultDirectEditorEdit(theRequest);
+ } else {
+ configuration.preEditAction(resolveSemanticElement());
+ Dialog dialog = null;
+ if(configuration instanceof IPopupEditorConfiguration) {
+ IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);
+ helper.showEditor();
+ return;
+ } else if(configuration instanceof IAdvancedEditorConfiguration) {
+ dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+ } else if(configuration instanceof IDirectEditorConfiguration) {
+ dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);
+ } else {
+ return;
+ }
+ final Dialog finalDialog = dialog;
+ if(Window.OK == dialog.open()) {
+ TransactionalEditingDomain domain = getEditingDomain();
+ RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+ @Override
+ protected void doExecute() {
+ configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());
+ }
+ };
+ domain.getCommandStack().execute(command);
+ }
+ }
+ break;
+ case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+ // initialize the direct edit manager
+ try {
+ getEditingDomain().runExclusive(new Runnable() {
+
+ public void run() {
+ if(isActive() && isEditable()) {
+ if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+ Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+ performDirectEdit(initialChar.charValue());
+ } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+ DirectEditRequest editRequest = (DirectEditRequest)theRequest;
+ performDirectEdit(editRequest.getLocation());
+ } else {
+ performDirectEdit();
+ }
+ }
+ }
+ });
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshLabel();
+ refreshFont();
+ refreshFontColor();
+ refreshUnderline();
+ refreshStrikeThrough();
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshLabel() {
+ EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+ if(maskLabelPolicy == null) {
+ setLabelTextHelper(getFigure(), getLabelText());
+ setLabelIconHelper(getFigure(), getLabelIcon());
+ }
+ Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+ if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+ }
+ Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+ if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshUnderline() {
+ FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if(style != null && getFigure() instanceof WrappingLabel) {
+ ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshStrikeThrough() {
+ FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if(style != null && getFigure() instanceof WrappingLabel) {
+ ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshFont() {
+ FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if(style != null) {
+ FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+ setFont(fontData);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setFontColor(Color color) {
+ getFigure().setForegroundColor(color);
+ }
+
+ /**
+ * @generated
+ */
+ protected void addSemanticListeners() {
+ if(getParser() instanceof ISemanticParser) {
+ EObject element = resolveSemanticElement();
+ parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);
+ for(int i = 0; i < parserElements.size(); i++) {
+ addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$
+ }
+ } else {
+ super.addSemanticListeners();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void removeSemanticListeners() {
+ if(parserElements != null) {
+ for(int i = 0; i < parserElements.size(); i++) {
+ removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+ }
+ } else {
+ super.removeSemanticListeners();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected AccessibleEditPart getAccessibleEditPart() {
+ if(accessibleEP == null) {
+ accessibleEP = new AccessibleGraphicalEditPart() {
+
+ public void getName(AccessibleEvent e) {
+ e.result = getLabelTextHelper(getFigure());
+ }
+ };
+ }
+ return accessibleEP;
+ }
+
+ /**
+ * @generated
+ */
+ private View getFontStyleOwnerView() {
+ return getPrimaryView();
+ }
+
+ /**
+ * Returns the kind of associated editor for direct edition.
+ *
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+ * @generated
+ */
+ public int getDirectEditionType() {
+ if(checkExtendedEditor()) {
+ initExtendedEditorConfiguration();
+ return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+ }
+ if(checkDefaultEdition()) {
+ return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+ }
+ // not a named element. no specific editor => do nothing
+ return IDirectEdition.NO_DIRECT_EDITION;
+ }
+
+ /**
+ * Checks if an extended editor is present.
+ *
+ * @return <code>true</code> if an extended editor is present.
+ * @generated
+ */
+ protected boolean checkExtendedEditor() {
+ if(resolveSemanticElement() != null) {
+ return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+ }
+ return false;
+ }
+
+ /**
+ * Checks if a default direct edition is available
+ *
+ * @return <code>true</code> if a default direct edition is available
+ * @generated
+ */
+ protected boolean checkDefaultEdition() {
+ return (getParser() != null);
+ }
+
+ /**
+ * Initializes the extended editor configuration
+ *
+ * @generated
+ */
+ protected void initExtendedEditorConfiguration() {
+ if(configuration == null) {
+ final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+ if(languagePreferred != null && !languagePreferred.equals("")) {
+ configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+ } else {
+ configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+ }
+ }
+ }
+
+ /**
+ * Updates the preference configuration
+ *
+ * @generated
+ */
+ protected void updateExtendedEditorConfiguration() {
+ String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+ if(languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
+ configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+ } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+ configuration = null;
+ }
+ }
+
+ /**
+ * Performs the direct edit usually used by GMF editors.
+ *
+ * @param theRequest
+ * the direct edit request that starts the direct edit system
+ * @generated
+ */
+ protected void performDefaultDirectEditorEdit(final Request theRequest) {
+ // initialize the direct edit manager
+ try {
+ getEditingDomain().runExclusive(new Runnable() {
+
+ public void run() {
+ if(isActive() && isEditable()) {
+ if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+ Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+ performDirectEdit(initialChar.charValue());
+ } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+ DirectEditRequest editRequest = (DirectEditRequest)theRequest;
+ performDirectEdit(editRequest.getLocation());
+ } else {
+ performDirectEdit();
+ }
+ }
+ }
+ });
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void addNotationalListeners() {
+ super.addNotationalListeners();
+ addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
+ }
+
+ /**
+ * @generated
+ */
+ protected void removeNotationalListeners() {
+ super.removeNotationalListeners();
+ removeListenerFilter("PrimaryView"); //$NON-NLS-1$
+ }
+
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification event) {
+ Object feature = event.getFeature();
+ if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+ Integer c = (Integer)event.getNewValue();
+ setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+ } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+ refreshUnderline();
+ } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+ refreshStrikeThrough();
+ } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+ refreshFont();
+ } else {
+ if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+ refreshLabel();
+ }
+ if(getParser() instanceof ISemanticParser) {
+ ISemanticParser modelParser = (ISemanticParser)getParser();
+ if(modelParser.areSemanticElementsAffected(null, event)) {
+ removeSemanticListeners();
+ if(resolveSemanticElement() != null) {
+ addSemanticListeners();
+ }
+ refreshLabel();
+ }
+ }
+ }
+ if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {
+ refreshLabel();
+ }
+ super.handleNotificationEvent(event);
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure createFigure() {
+ IFigure label = createFigurePrim();
+ defaultText = getLabelTextHelper(label);
+ return label;
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure createFigurePrim() {
+ return new ReceptionDescriptor();
+ }
+
+ /**
+ * @generated
+ */
+ public class ReceptionDescriptor extends WrappingLabel {
+
+ /**
+ * @generated
+ */
+ public ReceptionDescriptor() {
+ this.setText("");
+ }
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UMLEditPartFactory.java index 7c8019378db..bfb80f47e2c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UMLEditPartFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UMLEditPartFactory.java @@ -160,6 +160,8 @@ public class UMLEditPartFactory implements EditPartFactory { return new EnumerationLiteralEditPart(view);
case ReceptionEditPart.VISUAL_ID:
return new ReceptionEditPart(view);
+ case ReceptionInInterfaceEditPart.VISUAL_ID:
+ return new ReceptionInInterfaceEditPart(view);
case SlotEditPart.VISUAL_ID:
return new SlotEditPart(view);
case RedefinableTemplateSignatureEditPart.VISUAL_ID:
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicy.java index d7522bc74dd..f681d712190 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicy.java @@ -14,9 +14,11 @@ package org.eclipse.papyrus.uml.diagram.clazz.edit.policies; import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
@@ -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.clazz.edit.parts.OperationForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;
import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;
import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;
@@ -46,6 +49,11 @@ public class ComponentOperationCompartmentCanonicalEditPolicy 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();
@@ -58,8 +66,13 @@ public class ComponentOperationCompartmentCanonicalEditPolicy extends CanonicalE /**
* @generated
*/
- protected EStructuralFeature getFeatureToSynchronize() {
- return UMLPackage.eINSTANCE.getClass_OwnedOperation();
+ protected Set getFeaturesToSynchronize() {
+ if(myFeaturesToSynchronize == null) {
+ myFeaturesToSynchronize = new HashSet<EStructuralFeature>();
+ myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getClass_OwnedOperation());
+ myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getClass_OwnedReception());
+ }
+ return myFeaturesToSynchronize;
}
/**
@@ -87,7 +100,8 @@ public class ComponentOperationCompartmentCanonicalEditPolicy extends CanonicalE * @generated
*/
private boolean isMyDiagramElement(View view) {
- return OperationForComponentEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);
+ int visualID = UMLVisualIDRegistry.getVisualID(view);
+ return visualID == OperationForComponentEditPart.VISUAL_ID || visualID == ReceptionEditPart.VISUAL_ID;
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicyCN.java index 7301a4ff372..2c0ced6cd38 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicyCN.java @@ -14,9 +14,11 @@ package org.eclipse.papyrus.uml.diagram.clazz.edit.policies; import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
@@ -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.clazz.edit.parts.OperationForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;
import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;
import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;
@@ -46,6 +49,11 @@ public class ComponentOperationCompartmentCanonicalEditPolicyCN 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();
@@ -58,8 +66,13 @@ public class ComponentOperationCompartmentCanonicalEditPolicyCN extends Canonica /**
* @generated
*/
- protected EStructuralFeature getFeatureToSynchronize() {
- return UMLPackage.eINSTANCE.getClass_OwnedOperation();
+ protected Set getFeaturesToSynchronize() {
+ if(myFeaturesToSynchronize == null) {
+ myFeaturesToSynchronize = new HashSet<EStructuralFeature>();
+ myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getClass_OwnedOperation());
+ myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getClass_OwnedReception());
+ }
+ return myFeaturesToSynchronize;
}
/**
@@ -87,7 +100,8 @@ public class ComponentOperationCompartmentCanonicalEditPolicyCN extends Canonica * @generated
*/
private boolean isMyDiagramElement(View view) {
- return OperationForComponentEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);
+ int visualID = UMLVisualIDRegistry.getVisualID(view);
+ return visualID == OperationForComponentEditPart.VISUAL_ID || visualID == ReceptionEditPart.VISUAL_ID;
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicy.java index a3083b1bb78..dae64dc968a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicy.java @@ -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.clazz.edit.commands.OperationForComponentCreateCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ReceptionCreateCommand;
import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
/**
@@ -58,6 +59,12 @@ public class ComponentOperationCompartmentItemSemanticEditPolicy extends UMLBase }
return getGEFWrapper(new OperationForComponentCreateCommand(req));
}
+ if(UMLElementTypes.Reception_3011 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new ReceptionCreateCommand(req));
+ }
return super.getCreateCommand(req);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicyCN.java index d1b73de6efb..298dc71b44d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicyCN.java @@ -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.clazz.edit.commands.OperationForComponentCreateCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ReceptionCreateCommand;
import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
/**
@@ -58,6 +59,12 @@ public class ComponentOperationCompartmentItemSemanticEditPolicyCN extends UMLBa }
return getGEFWrapper(new OperationForComponentCreateCommand(req));
}
+ if(UMLElementTypes.Reception_3011 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new ReceptionCreateCommand(req));
+ }
return super.getCreateCommand(req);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java index 6bb2cec2c17..b188808452d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java @@ -14,9 +14,11 @@ package org.eclipse.papyrus.uml.diagram.clazz.edit.policies; import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
@@ -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.clazz.edit.parts.OperationForInterfaceEditpart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionInInterfaceEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;
import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;
import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;
@@ -46,6 +49,11 @@ public class InterfaceOperationCompartmentCanonicalEditPolicy 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();
@@ -58,8 +66,13 @@ public class InterfaceOperationCompartmentCanonicalEditPolicy extends CanonicalE /**
* @generated
*/
- protected EStructuralFeature getFeatureToSynchronize() {
- return UMLPackage.eINSTANCE.getInterface_OwnedOperation();
+ protected Set getFeaturesToSynchronize() {
+ if(myFeaturesToSynchronize == null) {
+ myFeaturesToSynchronize = new HashSet<EStructuralFeature>();
+ myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getInterface_OwnedOperation());
+ myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getInterface_OwnedReception());
+ }
+ return myFeaturesToSynchronize;
}
/**
@@ -87,7 +100,8 @@ public class InterfaceOperationCompartmentCanonicalEditPolicy extends CanonicalE * @generated
*/
private boolean isMyDiagramElement(View view) {
- return OperationForInterfaceEditpart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);
+ int visualID = UMLVisualIDRegistry.getVisualID(view);
+ return visualID == OperationForInterfaceEditpart.VISUAL_ID || visualID == ReceptionInInterfaceEditPart.VISUAL_ID;
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java index fff547c6b96..c214e4ba1e6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java @@ -14,9 +14,11 @@ package org.eclipse.papyrus.uml.diagram.clazz.edit.policies; import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
@@ -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.clazz.edit.parts.OperationForInterfaceEditpart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionInInterfaceEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;
import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;
import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;
@@ -46,6 +49,11 @@ public class InterfaceOperationCompartmentCanonicalEditPolicyCN 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();
@@ -58,8 +66,13 @@ public class InterfaceOperationCompartmentCanonicalEditPolicyCN extends Canonica /**
* @generated
*/
- protected EStructuralFeature getFeatureToSynchronize() {
- return UMLPackage.eINSTANCE.getInterface_OwnedOperation();
+ protected Set getFeaturesToSynchronize() {
+ if(myFeaturesToSynchronize == null) {
+ myFeaturesToSynchronize = new HashSet<EStructuralFeature>();
+ myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getInterface_OwnedOperation());
+ myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getInterface_OwnedReception());
+ }
+ return myFeaturesToSynchronize;
}
/**
@@ -87,7 +100,8 @@ public class InterfaceOperationCompartmentCanonicalEditPolicyCN extends Canonica * @generated
*/
private boolean isMyDiagramElement(View view) {
- return OperationForInterfaceEditpart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);
+ int visualID = UMLVisualIDRegistry.getVisualID(view);
+ return visualID == OperationForInterfaceEditpart.VISUAL_ID || visualID == ReceptionInInterfaceEditPart.VISUAL_ID;
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicy.java index 5d1eb9a0f4c..5d1a34d59fa 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicy.java @@ -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.clazz.edit.commands.OperationForInterfaceCreateCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ReceptionInInterfaceCreateCommand;
import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
/**
@@ -58,6 +59,12 @@ public class InterfaceOperationCompartmentItemSemanticEditPolicy extends UMLBase }
return getGEFWrapper(new OperationForInterfaceCreateCommand(req));
}
+ if(UMLElementTypes.Reception_3039 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new ReceptionInInterfaceCreateCommand(req));
+ }
return super.getCreateCommand(req);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java index 1e60647d0d1..7a3d38c7643 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java @@ -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.clazz.edit.commands.OperationForInterfaceCreateCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ReceptionInInterfaceCreateCommand;
import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
/**
@@ -58,6 +59,12 @@ public class InterfaceOperationCompartmentItemSemanticEditPolicyCN extends UMLBa }
return getGEFWrapper(new OperationForInterfaceCreateCommand(req));
}
+ if(UMLElementTypes.Reception_3039 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new ReceptionInInterfaceCreateCommand(req));
+ }
return super.getCreateCommand(req);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ReceptionInInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ReceptionInInterfaceItemSemanticEditPolicy.java new file mode 100644 index 00000000000..84c8ab03294 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ReceptionInInterfaceItemSemanticEditPolicy.java @@ -0,0 +1,61 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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) Patrick.tessier@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.DeleteCommand;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+
+/**
+ * @generated
+ */
+public class ReceptionInInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
+
+ /**
+ * @generated
+ */
+ public ReceptionInInterfaceItemSemanticEditPolicy() {
+ super(UMLElementTypes.Reception_3039);
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getDestroyElementCommand(DestroyElementRequest req) {
+ View view = (View)getHost().getModel();
+ CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);
+ cmd.setTransactionNestingEnabled(true);
+ EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
+ if(annotation == null) {
+ // there are indirectly referenced children, need extra commands: false
+ addDestroyShortcutsCommand(cmd, view);
+ // delete host element
+ List<EObject> todestroy = new ArrayList<EObject>();
+ todestroy.add(req.getElementToDestroy());
+ //cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));
+ cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));
+ } else {
+ cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));
+ }
+ return getGEFWrapper(cmd.reduce());
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java index 5a98af303fe..d15542945dd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java @@ -703,6 +703,14 @@ public class UMLDiagramUpdater { continue;
}
}
+ for(Iterator<?> it = modelElement.getOwnedReceptions().iterator(); it.hasNext();) {
+ Reception childElement = (Reception)it.next();
+ int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
+ if(visualID == ReceptionEditPart.VISUAL_ID) {
+ result.add(new UMLNodeDescriptor(childElement, visualID));
+ continue;
+ }
+ }
return result;
}
@@ -799,6 +807,14 @@ public class UMLDiagramUpdater { continue;
}
}
+ for(Iterator<?> it = modelElement.getOwnedReceptions().iterator(); it.hasNext();) {
+ Reception childElement = (Reception)it.next();
+ int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
+ if(visualID == ReceptionInInterfaceEditPart.VISUAL_ID) {
+ result.add(new UMLNodeDescriptor(childElement, visualID));
+ continue;
+ }
+ }
return result;
}
@@ -1195,6 +1211,14 @@ public class UMLDiagramUpdater { continue;
}
}
+ for(Iterator<?> it = modelElement.getOwnedReceptions().iterator(); it.hasNext();) {
+ Reception childElement = (Reception)it.next();
+ int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
+ if(visualID == ReceptionEditPart.VISUAL_ID) {
+ result.add(new UMLNodeDescriptor(childElement, visualID));
+ continue;
+ }
+ }
return result;
}
@@ -1271,6 +1295,14 @@ public class UMLDiagramUpdater { continue;
}
}
+ for(Iterator<?> it = modelElement.getOwnedReceptions().iterator(); it.hasNext();) {
+ Reception childElement = (Reception)it.next();
+ int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
+ if(visualID == ReceptionInInterfaceEditPart.VISUAL_ID) {
+ result.add(new UMLNodeDescriptor(childElement, visualID));
+ continue;
+ }
+ }
return result;
}
@@ -1796,6 +1828,8 @@ public class UMLDiagramUpdater { return getEnumerationLiteral_3017ContainedLinks(view);
case ReceptionEditPart.VISUAL_ID:
return getReception_3011ContainedLinks(view);
+ case ReceptionInInterfaceEditPart.VISUAL_ID:
+ return getReception_3039ContainedLinks(view);
case SlotEditPart.VISUAL_ID:
return getSlot_3030ContainedLinks(view);
case RedefinableTemplateSignatureEditPart.VISUAL_ID:
@@ -1953,6 +1987,8 @@ public class UMLDiagramUpdater { return getEnumerationLiteral_3017IncomingLinks(view);
case ReceptionEditPart.VISUAL_ID:
return getReception_3011IncomingLinks(view);
+ case ReceptionInInterfaceEditPart.VISUAL_ID:
+ return getReception_3039IncomingLinks(view);
case SlotEditPart.VISUAL_ID:
return getSlot_3030IncomingLinks(view);
case RedefinableTemplateSignatureEditPart.VISUAL_ID:
@@ -2110,6 +2146,8 @@ public class UMLDiagramUpdater { return getEnumerationLiteral_3017OutgoingLinks(view);
case ReceptionEditPart.VISUAL_ID:
return getReception_3011OutgoingLinks(view);
+ case ReceptionInInterfaceEditPart.VISUAL_ID:
+ return getReception_3039OutgoingLinks(view);
case SlotEditPart.VISUAL_ID:
return getSlot_3030OutgoingLinks(view);
case RedefinableTemplateSignatureEditPart.VISUAL_ID:
@@ -2639,6 +2677,17 @@ public class UMLDiagramUpdater { /**
* @generated
*/
+ public static List<UMLLinkDescriptor> getReception_3039ContainedLinks(View view) {
+ Reception modelElement = (Reception)view.getElement();
+ LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
+ result.addAll(getContainedTypeModelFacetLinks_ElementImport_4009(modelElement));
+ result.addAll(getContainedTypeModelFacetLinks_PackageImport_4010(modelElement));
+ return result;
+ }
+
+ /**
+ * @generated
+ */
public static List<UMLLinkDescriptor> getSlot_3030ContainedLinks(View view) {
return Collections.emptyList();
}
@@ -3589,6 +3638,13 @@ public class UMLDiagramUpdater { /**
* @generated
*/
+ public static List<UMLLinkDescriptor> getReception_3039IncomingLinks(View view) {
+ return Collections.emptyList();
+ }
+
+ /**
+ * @generated
+ */
public static List<UMLLinkDescriptor> getSlot_3030IncomingLinks(View view) {
return Collections.emptyList();
}
@@ -4743,6 +4799,13 @@ public class UMLDiagramUpdater { /**
* @generated
*/
+ public static List<UMLLinkDescriptor> getReception_3039OutgoingLinks(View view) {
+ return Collections.emptyList();
+ }
+
+ /**
+ * @generated
+ */
public static List<UMLLinkDescriptor> getSlot_3030OutgoingLinks(View view) {
return Collections.emptyList();
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLPaletteFactory.java index 11d5584bdd5..abdd83d568a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLPaletteFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLPaletteFactory.java @@ -604,8 +604,9 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { * @generated
*/
private Tool createReception18CreationTool() {
- List<IElementType> types = new ArrayList<IElementType>(1);
+ List<IElementType> types = new ArrayList<IElementType>(2);
types.add(UMLElementTypes.Reception_3011);
+ types.add(UMLElementTypes.Reception_3039);
Tool tool = new AspectUnspecifiedTypeCreationTool(types);
return tool;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java index a4ba9bd6486..95a209257a2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java @@ -293,6 +293,9 @@ public class UMLVisualIDRegistry { if(UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {
return OperationForComponentEditPart.VISUAL_ID;
}
+ if(UMLPackage.eINSTANCE.getReception().isSuperTypeOf(domainElement.eClass())) {
+ return ReceptionEditPart.VISUAL_ID;
+ }
break;
case ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID:
if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
@@ -313,6 +316,9 @@ public class UMLVisualIDRegistry { if(UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {
return OperationForInterfaceEditpart.VISUAL_ID;
}
+ if(UMLPackage.eINSTANCE.getReception().isSuperTypeOf(domainElement.eClass())) {
+ return ReceptionInInterfaceEditPart.VISUAL_ID;
+ }
break;
case InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID:
if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
@@ -445,6 +451,9 @@ public class UMLVisualIDRegistry { if(UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {
return OperationForComponentEditPart.VISUAL_ID;
}
+ if(UMLPackage.eINSTANCE.getReception().isSuperTypeOf(domainElement.eClass())) {
+ return ReceptionEditPart.VISUAL_ID;
+ }
break;
case ComponentNestedClassifierCompartmentEditPart.VISUAL_ID:
if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
@@ -463,6 +472,9 @@ public class UMLVisualIDRegistry { if(UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {
return OperationForInterfaceEditpart.VISUAL_ID;
}
+ if(UMLPackage.eINSTANCE.getReception().isSuperTypeOf(domainElement.eClass())) {
+ return ReceptionInInterfaceEditPart.VISUAL_ID;
+ }
break;
case InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID:
if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
@@ -1064,6 +1076,9 @@ public class UMLVisualIDRegistry { if(OperationForComponentEditPart.VISUAL_ID == nodeVisualID) {
return true;
}
+ if(ReceptionEditPart.VISUAL_ID == nodeVisualID) {
+ return true;
+ }
break;
case ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID:
if(NestedClassForComponentEditPart.VISUAL_ID == nodeVisualID) {
@@ -1084,6 +1099,9 @@ public class UMLVisualIDRegistry { if(OperationForInterfaceEditpart.VISUAL_ID == nodeVisualID) {
return true;
}
+ if(ReceptionInInterfaceEditPart.VISUAL_ID == nodeVisualID) {
+ return true;
+ }
break;
case InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID:
if(NestedClassForInterfaceEditPart.VISUAL_ID == nodeVisualID) {
@@ -1216,6 +1234,9 @@ public class UMLVisualIDRegistry { if(OperationForComponentEditPart.VISUAL_ID == nodeVisualID) {
return true;
}
+ if(ReceptionEditPart.VISUAL_ID == nodeVisualID) {
+ return true;
+ }
break;
case ComponentNestedClassifierCompartmentEditPart.VISUAL_ID:
if(NestedClassForComponentEditPart.VISUAL_ID == nodeVisualID) {
@@ -1234,6 +1255,9 @@ public class UMLVisualIDRegistry { if(OperationForInterfaceEditpart.VISUAL_ID == nodeVisualID) {
return true;
}
+ if(ReceptionInInterfaceEditPart.VISUAL_ID == nodeVisualID) {
+ return true;
+ }
break;
case InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID:
if(NestedClassForInterfaceEditPart.VISUAL_ID == nodeVisualID) {
@@ -1696,6 +1720,7 @@ public class UMLVisualIDRegistry { case NestedInterfaceForClassEditPart.VISUAL_ID:
case NestedInterfaceForComponentEditPart.VISUAL_ID:
case NestedInterfaceForInterfaceEditPart.VISUAL_ID:
+ case ReceptionInInterfaceEditPart.VISUAL_ID:
return true;
default:
break;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/ElementInitializers.java index f90e4a9e7fd..70f3f4bb194 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/ElementInitializers.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/ElementInitializers.java @@ -412,6 +412,18 @@ public class ElementInitializers { /**
* @generated
*/
+ public void init_Reception_3039(Reception instance) {
+ try {
+ Object value_0 = name_Reception_3039(instance);
+ instance.setName((String)value_0);
+ } catch (RuntimeException e) {
+ UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
+ }
+ }
+
+ /**
+ * @generated
+ */
public void init_RedefinableTemplateSignature_3015(RedefinableTemplateSignature instance) {
try {
Object value_0 = name_RedefinableTemplateSignature_3015(instance);
@@ -931,6 +943,13 @@ public class ElementInitializers { /**
* @generated
*/
+ private String name_Reception_3039(Reception self) {
+ return NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());
+ }
+
+ /**
+ * @generated
+ */
private String name_RedefinableTemplateSignature_3015(RedefinableTemplateSignature self) {
return NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLElementTypes.java index 163a67eec3a..75511a0c7d4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLElementTypes.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLElementTypes.java @@ -98,6 +98,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForSignalEditPar import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionInInterfaceEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShapeNamedElementEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShortCutDiagramEditPart;
@@ -338,6 +339,11 @@ public class UMLElementTypes { /**
* @generated
*/
+ public static final IElementType Reception_3039 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Reception_3039"); //$NON-NLS-1$
+
+ /**
+ * @generated
+ */
public static final IElementType Slot_3030 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Slot_3030"); //$NON-NLS-1$
/**
@@ -699,6 +705,7 @@ public class UMLElementTypes { elements.put(TemplateParameter_3016, UMLPackage.eINSTANCE.getTemplateParameter());
elements.put(EnumerationLiteral_3017, UMLPackage.eINSTANCE.getEnumerationLiteral());
elements.put(Reception_3011, UMLPackage.eINSTANCE.getReception());
+ elements.put(Reception_3039, UMLPackage.eINSTANCE.getReception());
elements.put(Slot_3030, UMLPackage.eINSTANCE.getSlot());
elements.put(RedefinableTemplateSignature_3015, UMLPackage.eINSTANCE.getRedefinableTemplateSignature());
elements.put(TemplateSignature_3033, UMLPackage.eINSTANCE.getTemplateSignature());
@@ -795,6 +802,7 @@ public class UMLElementTypes { KNOWN_ELEMENT_TYPES.add(TemplateParameter_3016);
KNOWN_ELEMENT_TYPES.add(EnumerationLiteral_3017);
KNOWN_ELEMENT_TYPES.add(Reception_3011);
+ KNOWN_ELEMENT_TYPES.add(Reception_3039);
KNOWN_ELEMENT_TYPES.add(Slot_3030);
KNOWN_ELEMENT_TYPES.add(RedefinableTemplateSignature_3015);
KNOWN_ELEMENT_TYPES.add(Node_3032);
@@ -926,6 +934,8 @@ public class UMLElementTypes { return EnumerationLiteral_3017;
case ReceptionEditPart.VISUAL_ID:
return Reception_3011;
+ case ReceptionInInterfaceEditPart.VISUAL_ID:
+ return Reception_3039;
case SlotEditPart.VISUAL_ID:
return Slot_3030;
case RedefinableTemplateSignatureEditPart.VISUAL_ID:
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLModelingAssistantProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLModelingAssistantProvider.java index f7f77e2fc0b..11d7276e449 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLModelingAssistantProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLModelingAssistantProvider.java @@ -120,10 +120,11 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider { return types;
}
if(editPart instanceof ComponentEditPart) {
- ArrayList<IElementType> types = new ArrayList<IElementType>(5);
+ ArrayList<IElementType> types = new ArrayList<IElementType>(6);
types.add(UMLElementTypes.RedefinableTemplateSignature_3015);
types.add(UMLElementTypes.Property_3002);
types.add(UMLElementTypes.Operation_3003);
+ types.add(UMLElementTypes.Reception_3011);
types.add(UMLElementTypes.Class_3004);
types.add(UMLElementTypes.Interface_3037);
return types;
@@ -135,10 +136,11 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider { return types;
}
if(editPart instanceof InterfaceEditPart) {
- ArrayList<IElementType> types = new ArrayList<IElementType>(5);
+ ArrayList<IElementType> types = new ArrayList<IElementType>(6);
types.add(UMLElementTypes.RedefinableTemplateSignature_3015);
types.add(UMLElementTypes.Property_3006);
types.add(UMLElementTypes.Operation_3007);
+ types.add(UMLElementTypes.Reception_3039);
types.add(UMLElementTypes.Class_3008);
types.add(UMLElementTypes.Interface_3038);
return types;
@@ -199,10 +201,11 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider { return types;
}
if(editPart instanceof ComponentEditPartCN) {
- ArrayList<IElementType> types = new ArrayList<IElementType>(4);
+ ArrayList<IElementType> types = new ArrayList<IElementType>(5);
types.add(UMLElementTypes.RedefinableTemplateSignature_3015);
types.add(UMLElementTypes.Property_3002);
types.add(UMLElementTypes.Operation_3003);
+ types.add(UMLElementTypes.Reception_3011);
types.add(UMLElementTypes.Class_3004);
return types;
}
@@ -213,10 +216,11 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider { return types;
}
if(editPart instanceof InterfaceEditPartCN) {
- ArrayList<IElementType> types = new ArrayList<IElementType>(4);
+ ArrayList<IElementType> types = new ArrayList<IElementType>(5);
types.add(UMLElementTypes.RedefinableTemplateSignature_3015);
types.add(UMLElementTypes.Property_3006);
types.add(UMLElementTypes.Operation_3007);
+ types.add(UMLElementTypes.Reception_3039);
types.add(UMLElementTypes.Class_3008);
return types;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLParserProvider.java index 0782b1c1f6b..0e30c493e28 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLParserProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLParserProvider.java @@ -105,6 +105,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForSignalEditPar import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationNameEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionInInterfaceEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShapeNamedElementNameEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalNameEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalNameEditPartCN;
@@ -761,6 +762,23 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid /**
* @generated
*/
+ private IParser reception_3039Parser;
+
+ /**
+ * @generated
+ */
+ private IParser getReception_3039Parser() {
+ if(reception_3039Parser == null) {
+ EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };
+ MessageFormatParser parser = new MessageFormatParser(features);
+ reception_3039Parser = parser;
+ }
+ return reception_3039Parser;
+ }
+
+ /**
+ * @generated
+ */
private SlotParser slot_3030Parser;
/**
@@ -1658,6 +1676,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid return getEnumerationLiteral_3017Parser();
case ReceptionEditPart.VISUAL_ID:
return getReception_3011Parser();
+ case ReceptionInInterfaceEditPart.VISUAL_ID:
+ return getReception_3039Parser();
case SlotEditPart.VISUAL_ID:
return getSlot_3030Parser();
case InstanceSpecificationNameEditPartCN.VISUAL_ID:
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java index 0bb15164d8d..aac13bec2b5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java @@ -195,6 +195,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { case TemplateParameterEditPart.VISUAL_ID:
case EnumerationLiteralEditPart.VISUAL_ID:
case ReceptionEditPart.VISUAL_ID:
+ case ReceptionInInterfaceEditPart.VISUAL_ID:
case SlotEditPart.VISUAL_ID:
case RedefinableTemplateSignatureEditPart.VISUAL_ID:
case TemplateSignatureEditPart.VISUAL_ID:
@@ -238,7 +239,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { }
}
}
- return DependencyNodeEditPart.VISUAL_ID == visualID || AssociationClassEditPart.VISUAL_ID == visualID || AssociationNodeEditPart.VISUAL_ID == visualID || InstanceSpecificationEditPart.VISUAL_ID == visualID || ComponentEditPart.VISUAL_ID == visualID || SignalEditPart.VISUAL_ID == visualID || InterfaceEditPart.VISUAL_ID == visualID || ModelEditPartTN.VISUAL_ID == visualID || EnumerationEditPart.VISUAL_ID == visualID || PackageEditPart.VISUAL_ID == visualID || ClassEditPart.VISUAL_ID == visualID || PrimitiveTypeEditPart.VISUAL_ID == visualID || DataTypeEditPart.VISUAL_ID == visualID || ConstraintEditPart.VISUAL_ID == visualID || CommentEditPart.VISUAL_ID == visualID || ShortCutDiagramEditPart.VISUAL_ID == visualID || DurationObservationEditPart.VISUAL_ID == visualID || TimeObservationEditPart.VISUAL_ID == visualID || DefaultNamedElementEditPart.VISUAL_ID == visualID || ShapeNamedElementEditPart.VISUAL_ID == visualID || PropertyForClassEditPart.VISUAL_ID == visualID || PropertyForComponentEditPart.VISUAL_ID == visualID || PropertyForSignalEditPart.VISUAL_ID == visualID || PropertyForInterfaceEditPart.VISUAL_ID == visualID || PropertyforDataTypeEditPart.VISUAL_ID == visualID || NestedClassForClassEditPart.VISUAL_ID == visualID || NestedClassForComponentEditPart.VISUAL_ID == visualID || NestedClassForInterfaceEditPart.VISUAL_ID == visualID || OperationForClassEditPart.VISUAL_ID == visualID || OperationForComponentEditPart.VISUAL_ID == visualID || OperationForInterfaceEditpart.VISUAL_ID == visualID || OperationForDataTypeEditPart.VISUAL_ID == visualID || ConnectableElementTemplateParameterEditPart.VISUAL_ID == visualID || OperationTemplateParameterEditPart.VISUAL_ID == visualID || ClassifierTemplateParameterEditPart.VISUAL_ID == visualID || TemplateParameterEditPart.VISUAL_ID == visualID || EnumerationLiteralEditPart.VISUAL_ID == visualID || ReceptionEditPart.VISUAL_ID == visualID || SlotEditPart.VISUAL_ID == visualID || RedefinableTemplateSignatureEditPart.VISUAL_ID == visualID || ContainmentCircleEditPart.VISUAL_ID == visualID || TemplateSignatureEditPart.VISUAL_ID == visualID || InstanceSpecificationEditPartCN.VISUAL_ID == visualID || ComponentEditPartCN.VISUAL_ID == visualID || SignalEditPartCN.VISUAL_ID == visualID || InterfaceEditPartCN.VISUAL_ID == visualID || ModelEditPartCN.VISUAL_ID == visualID || EnumerationEditPartCN.VISUAL_ID == visualID || PackageEditPartCN.VISUAL_ID == visualID || ClassEditPartCN.VISUAL_ID == visualID || PrimitiveTypeEditPartCN.VISUAL_ID == visualID || DataTypeEditPartCN.VISUAL_ID == visualID || CommentEditPartCN.VISUAL_ID == visualID || ConstraintEditPartCN.VISUAL_ID == visualID || NestedInterfaceForClassEditPart.VISUAL_ID == visualID || NestedInterfaceForComponentEditPart.VISUAL_ID == visualID || NestedInterfaceForInterfaceEditPart.VISUAL_ID == visualID;
+ return DependencyNodeEditPart.VISUAL_ID == visualID || AssociationClassEditPart.VISUAL_ID == visualID || AssociationNodeEditPart.VISUAL_ID == visualID || InstanceSpecificationEditPart.VISUAL_ID == visualID || ComponentEditPart.VISUAL_ID == visualID || SignalEditPart.VISUAL_ID == visualID || InterfaceEditPart.VISUAL_ID == visualID || ModelEditPartTN.VISUAL_ID == visualID || EnumerationEditPart.VISUAL_ID == visualID || PackageEditPart.VISUAL_ID == visualID || ClassEditPart.VISUAL_ID == visualID || PrimitiveTypeEditPart.VISUAL_ID == visualID || DataTypeEditPart.VISUAL_ID == visualID || ConstraintEditPart.VISUAL_ID == visualID || CommentEditPart.VISUAL_ID == visualID || ShortCutDiagramEditPart.VISUAL_ID == visualID || DurationObservationEditPart.VISUAL_ID == visualID || TimeObservationEditPart.VISUAL_ID == visualID || DefaultNamedElementEditPart.VISUAL_ID == visualID || ShapeNamedElementEditPart.VISUAL_ID == visualID || PropertyForClassEditPart.VISUAL_ID == visualID || PropertyForComponentEditPart.VISUAL_ID == visualID || PropertyForSignalEditPart.VISUAL_ID == visualID || PropertyForInterfaceEditPart.VISUAL_ID == visualID || PropertyforDataTypeEditPart.VISUAL_ID == visualID || NestedClassForClassEditPart.VISUAL_ID == visualID || NestedClassForComponentEditPart.VISUAL_ID == visualID || NestedClassForInterfaceEditPart.VISUAL_ID == visualID || OperationForClassEditPart.VISUAL_ID == visualID || OperationForComponentEditPart.VISUAL_ID == visualID || OperationForInterfaceEditpart.VISUAL_ID == visualID || OperationForDataTypeEditPart.VISUAL_ID == visualID || ConnectableElementTemplateParameterEditPart.VISUAL_ID == visualID || OperationTemplateParameterEditPart.VISUAL_ID == visualID || ClassifierTemplateParameterEditPart.VISUAL_ID == visualID || TemplateParameterEditPart.VISUAL_ID == visualID || EnumerationLiteralEditPart.VISUAL_ID == visualID || ReceptionEditPart.VISUAL_ID == visualID || ReceptionInInterfaceEditPart.VISUAL_ID == visualID || SlotEditPart.VISUAL_ID == visualID || RedefinableTemplateSignatureEditPart.VISUAL_ID == visualID || ContainmentCircleEditPart.VISUAL_ID == visualID || TemplateSignatureEditPart.VISUAL_ID == visualID || InstanceSpecificationEditPartCN.VISUAL_ID == visualID || ComponentEditPartCN.VISUAL_ID == visualID || SignalEditPartCN.VISUAL_ID == visualID || InterfaceEditPartCN.VISUAL_ID == visualID || ModelEditPartCN.VISUAL_ID == visualID || EnumerationEditPartCN.VISUAL_ID == visualID || PackageEditPartCN.VISUAL_ID == visualID || ClassEditPartCN.VISUAL_ID == visualID || PrimitiveTypeEditPartCN.VISUAL_ID == visualID || DataTypeEditPartCN.VISUAL_ID == visualID || CommentEditPartCN.VISUAL_ID == visualID || ConstraintEditPartCN.VISUAL_ID == visualID || NestedInterfaceForClassEditPart.VISUAL_ID == visualID || NestedInterfaceForComponentEditPart.VISUAL_ID == visualID || NestedInterfaceForInterfaceEditPart.VISUAL_ID == visualID;
}
/**
@@ -373,6 +374,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { return createEnumerationLiteral_3017(domainElement, containerView, index, persisted, preferencesHint);
case ReceptionEditPart.VISUAL_ID:
return createReception_3011(domainElement, containerView, index, persisted, preferencesHint);
+ case ReceptionInInterfaceEditPart.VISUAL_ID:
+ return createReception_3039(domainElement, containerView, index, persisted, preferencesHint);
case SlotEditPart.VISUAL_ID:
return createSlot_3030(domainElement, containerView, index, persisted, preferencesHint);
case RedefinableTemplateSignatureEditPart.VISUAL_ID:
@@ -1190,6 +1193,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /**
* @generated
*/
+ public Node createReception_3039(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
+ Node node = NotationFactory.eINSTANCE.createShape();
+ node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
+ node.setType(UMLVisualIDRegistry.getType(ReceptionInInterfaceEditPart.VISUAL_ID));
+ ViewUtil.insertChildView(containerView, node, index, persisted);
+ node.setElement(domainElement);
+ final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
+ PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Reception");
+ PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Reception");
+ return node;
+ }
+
+ /**
+ * @generated
+ */
public Node createSlot_3030(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
Node node = NotationFactory.eINSTANCE.createShape();
node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
|