Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaged Elaasar2015-12-10 14:26:30 -0500
committerGerrit Code Review @ Eclipse.org2016-03-22 09:45:02 -0400
commite8484696ad8258ca27ca5c622d037c975161ac6b (patch)
tree1640f5e2f80a242ecbc61b2a47fb0fc7fee8873c /plugins/sysml
parentac3e24920a8de354a1668d76d59dd549fda9306e (diff)
downloadorg.eclipse.papyrus-e8484696ad8258ca27ca5c622d037c975161ac6b.tar.gz
org.eclipse.papyrus-e8484696ad8258ca27ca5c622d037c975161ac6b.tar.xz
org.eclipse.papyrus-e8484696ad8258ca27ca5c622d037c975161ac6b.zip
Bug 489116 - Unify diagram visualID of all diagrams in Papyrus
1. Changed the visual ids of the UML2 diagrams from numbers to meaningful names corresponding to notational cases. This was applied consistely across diagram such that similar cases get similar visual ids. Added diagram reconcilers for v1.2 to migrate older diagrams. 2. Amalgamated the UML2 diagram element types into a single model (umldi.elementtypesconfigurations). Some diagrams, like Sequence, Communication and Timing, still use extension-based configurations and will need to be migrated later. Change-Id: I7f47b25454dcd1ed81e8f3eeffc1a09a2584d316 Signed-off-by: Maged Elaasar <melaasar@gmail.com>
Diffstat (limited to 'plugins/sysml')
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.gen.xml94
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml122
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ElementTypes.java83
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java4
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/migration/BDDReconciler.java (renamed from plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/migration/BDDReconcilier.java)2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLDiagramUpdater.java156
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintNodeLabelEditPart.java2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.gen.xml46
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml64
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java33
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java4
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/compatibility/DiagramVersionUpdater.java2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/InternalBlockDiagramReconcilerUndefinedTo100.java (renamed from plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/InternalBlockDiagramReconcilierUndefinedTo100.java)16
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/OldElementTypes.java8
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLDiagramUpdater.java94
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.classpath2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml86
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ElementTypes.java37
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramViewProvider.java37
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/migration/ParametricReconciler_1_2_0.java96
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.gen.xml168
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml935
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java129
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java62
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java2
26 files changed, 1043 insertions, 1247 deletions
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.gen.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.gen.xml
index 337e7e96517..37d985fa5e8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.gen.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.gen.xml
@@ -690,30 +690,11 @@
<viewProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.InheritedClassDiagramViewProvider">
<Priority name="Low"/>
- <!--
- "2005" = MODEL
- "3024" = MODEL_CN
- "2007" = PACKAGE
- "3009" = PACKAGE_CN
- "2001" = INSTANCE_SPECIFICATION
- "3020" = INSTANCE_SPECIFICATION_CN
- "2011" = CONSTRAINT
- "3029" = CONSTRAINT_CN
- "2012" = COMMENT
- "3028" = COMMENT_CN
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2005, 3024, 2007, 3009, 2001, 3020, 2011, 3029, 2012, 3028"/>
-
- <!--
- "3030" = INSTANCE_SPECIFICATION_SLOT_CLN
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3030"/>
-
- <!--
- "4013" = COMMENT_ANNOTATED_ELEMENT
- "4014" = CONSTRAINT_CONSTRAINED_ELEMENT
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4013, 4014"/>
+ <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Model_Shape, Model_Shape_CN, Package_Shape, Package_Shape_CN, InstanceSpecification_Shape, InstanceSpecification_Shape_CN, Constraint_Shape, Constraint_Shape_CN, Comment_Shape, Comment_Shape_CN"/>
+
+ <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Slot_SlotLabel"/>
+
+ <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge"/>
<!-- Additional descriptors provided in case the semantic hint is is not provided -->
@@ -799,111 +780,72 @@
<!-- EditPartProvider for inherited elements (from ClassDiagram) -->
<editpartProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.InheritedClassDiagramEditPartProvider">
<Priority name="Low"/>
- <!--
- The semantic hints given here are used in case the provider is not already loaded.
- As soon as the provider is loaded its provides method is used.
- "2005" = MODEL
- "5020" = MODEL_LABEL_NAME_TN_HINT
- "7009" = MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
- "3024" = MODEL_CN
- "5052" = MODEL_CN_LABEL_NAME_HINT
- "7030" = MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
- "2007" = PACKAGE
- "5026" = PACKAGE_LABEL_NAME_HINT
- "7016" = PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
- "3009" = PACKAGE_CN
- "5017" = PACKAGE_CN_LABEL_NAME_HINT
- "7010" = PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
- "2001" = INSTANCE_SPECIFICATION
- "5002" = INSTANCE_SPECIFICATION_LABEL_NAME_HINT
- "7001" = INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT
- "3020" = INSTANCE_SPECIFICATION_CN
- "5040" = INSTANCE_SPECIFICATION_CN_LABEL_NAME_HINT
- "7035" = INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT
- "2011" = CONSTRAINT
- "5037" = CONSTRAINT_LABEL_NAME_HINT
- "5159" = CONSTRAINT_LABEL_BODY_HINT
- "3029" = CONSTRAINT_CN
- "5064" = CONSTRAINT_CN_LABEL_NAME_HINT
- "5160" = CONSTRAINT_CN_LABEL_BODY_HINT
- "2012" = COMMENT
- "5038" = COMMENT_LABEL_BODY_HINT
- "3028" = COMMENT_CN
- "5063" = COMMENT_CN_LABEL_BODY_HINT
- -->
<object
id="MODEL"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2005, 5020, 7009"/>
+ <method name="getType()" value="Model_Shape, Model_NameLabel, Model_PackagedElementCompartment"/>
</object>
<object
id="MODEL_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3024, 5052, 7030"/>
+ <method name="getType()" value="Model_Shape_CN, Model_NameLabel_CN, Model_PackagedElementCompartment_CN"/>
</object>
<object
id="PACKAGE"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2007, 5026, 7016"/>
+ <method name="getType()" value="Package_Shape, Package_NameLabel, Package_PackagedElementCompartment"/>
</object>
<object
id="PACKAGE_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3009, 5017, 7010"/>
+ <method name="getType()" value="Package_Shape_CN, Package_NameLabel_CN, Package_PackagedElementCompartment_CN"/>
</object>
<object
id="INSTANCE_SPECIFICATION"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2001, 5002, 7001"/>
+ <method name="getType()" value="InstanceSpecification_Shape, InstanceSpecification_NameLabel, InstanceSpecification_SlotCompartment"/>
</object>
<object
id="INSTANCE_SPECIFICATION_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3020, 5040, 7035"/>
+ <method name="getType()" value="InstanceSpecification_Shape_CN, InstanceSpecification_NameLabel_CN, InstanceSpecification_SlotCompartment_CN"/>
</object>
<object
id="CONSTRAINT"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2011, 5037, 5159"/>
+ <method name="getType()" value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"/>
</object>
<object
id="CONSTRAINT_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3029, 5064, 5160"/>
+ <method name="getType()" value="Constraint_Shape_CN, Constraint_NameLabel_CN, Constraint_FloatingNameLabel_CN"/>
</object>
<object
id="COMMENT"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2012, 5038"/>
+ <method name="getType()" value="Comment_Shape, Comment_BodyLabel"/>
</object>
<object
id="COMMENT_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3028, 5063"/>
+ <method name="getType()" value="Comment_Shape_CN, Comment_BodyLabel_CN"/>
</object>
- <!--
- "3030" = INSTANCE_SPECIFICATION_SLOT_CLN
- -->
<object
id="INSTANCE_SPECIFICATION_SLOT_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3030"/>
+ <method name="getType()" value="Slot_SlotLabel"/>
</object>
- <!--
- "4013" = COMMENT_ANNOTATED_ELEMENT
- "4014" = CONSTRAINT_CONSTRAINED_ELEMENT
- -->
<object
id="COMMENT_ANNOTATED_ELEMENT"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4013"/>
+ <method name="getType()" value="Comment_AnnotatedElementEdge"/>
</object>
<object
id="CONSTRAINT_CONSTRAINED_ELEMENT"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4014"/>
+ <method name="getType()" value="Constraint_ConstrainedElementEdge"/>
</object>
<context views="MODEL, MODEL_CN, PACKAGE, PACKAGE_CN, INSTANCE_SPECIFICATION, INSTANCE_SPECIFICATION_CN, CONSTRAINT, CONSTRAINT_CN, COMMENT, COMMENT_CN"/>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
index feadd47335a..5f22318763a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
@@ -744,30 +744,11 @@
<!-- Load the ViewProvider on following SemanticHint related to IElementType(s) used in the palette (also used for legacy elements) -->
<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="UML::Model, UML::Package, UML::InstanceSpecification, UML::Comment, UML::Constraint, UML::Slot"/>
- <!--
- "2005" = MODEL
- "3024" = MODEL_CN
- "2007" = PACKAGE
- "3009" = PACKAGE_CN
- "2001" = INSTANCE_SPECIFICATION
- "3020" = INSTANCE_SPECIFICATION_CN
- "2011" = CONSTRAINT
- "3029" = CONSTRAINT_CN
- "2012" = COMMENT
- "3028" = COMMENT_CN
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2005, 3024, 2007, 3009, 2001, 3020, 2011, 3029, 2012, 3028"/>
+ <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Model_Shape, Model_Shape_CN, Package_Shape, Package_Shape_CN, InstanceSpecification_Shape, InstanceSpecification_Shape_CN, Constraint_Shape, Constraint_Shape_CN, Comment_Shape, Comment_Shape_CN"/>
- <!--
- "3030" = INSTANCE_SPECIFICATION_SLOT_CLN
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3030"/>
+ <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Slot_SlotLabel"/>
- <!--
- "4013" = COMMENT_ANNOTATED_ELEMENT
- "4014" = CONSTRAINT_CONSTRAINED_ELEMENT
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4013, 4014"/>
+ <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge"/>
<!-- Additional descriptors provided in case the semantic hint is is not provided -->
@@ -853,111 +834,72 @@
<!-- EditPartProvider for inherited elements (from ClassDiagram) -->
<editpartProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.InheritedClassDiagramEditPartProvider">
<Priority name="Low"/>
- <!--
- The semantic hints given here are used in case the provider is not already loaded.
- As soon as the provider is loaded its provides method is used.
- "2005" = MODEL
- "5020" = MODEL_LABEL_NAME_TN_HINT
- "7009" = MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
- "3024" = MODEL_CN
- "5052" = MODEL_CN_LABEL_NAME_HINT
- "7030" = MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
- "2007" = PACKAGE
- "5026" = PACKAGE_LABEL_NAME_HINT
- "7016" = PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
- "3009" = PACKAGE_CN
- "5017" = PACKAGE_CN_LABEL_NAME_HINT
- "7010" = PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
- "2001" = INSTANCE_SPECIFICATION
- "5002" = INSTANCE_SPECIFICATION_LABEL_NAME_HINT
- "7001" = INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT
- "3020" = INSTANCE_SPECIFICATION_CN
- "5040" = INSTANCE_SPECIFICATION_CN_LABEL_NAME_HINT
- "7035" = INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT
- "2011" = CONSTRAINT
- "5037" = CONSTRAINT_LABEL_NAME_HINT
- "5159" = CONSTRAINT_LABEL_BODY_HINT
- "3029" = CONSTRAINT_CN
- "5064" = CONSTRAINT_CN_LABEL_NAME_HINT
- "5160" = CONSTRAINT_CN_LABEL_BODY_HINT
- "2012" = COMMENT
- "5038" = COMMENT_LABEL_BODY_HINT
- "3028" = COMMENT_CN
- "5063" = COMMENT_CN_LABEL_BODY_HINT
- -->
<object
id="MODEL"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2005, 5020, 7009"/>
+ <method name="getType()" value="Model_Shape, Model_NameLabel, Model_PackagedElementCompartment"/>
</object>
<object
id="MODEL_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3024, 5052, 7030"/>
+ <method name="getType()" value="Model_Shape_CN, Model_NameLabel_CN, Model_PackagedElementCompartment_CN"/>
</object>
<object
id="PACKAGE"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2007, 5026, 7016"/>
+ <method name="getType()" value="Package_Shape, Package_NameLabel, Package_PackagedElementCompartment"/>
</object>
<object
id="PACKAGE_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3009, 5017, 7010"/>
+ <method name="getType()" value="Package_Shape_CN, Package_NameLabel_CN, Package_PackagedElementCompartment_CN"/>
</object>
<object
id="INSTANCE_SPECIFICATION"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2001, 5002, 7001"/>
+ <method name="getType()" value="InstanceSpecification_Shape, InstanceSpecification_NameLabel, InstanceSpecification_SlotCompartment"/>
</object>
<object
id="INSTANCE_SPECIFICATION_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3020, 5040, 7035"/>
+ <method name="getType()" value="InstanceSpecification_Shape_CN, InstanceSpecification_NameLabel_CN, InstanceSpecification_SlotCompartment_CN"/>
</object>
<object
id="CONSTRAINT"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2011, 5037, 5159"/>
+ <method name="getType()" value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"/>
</object>
<object
id="CONSTRAINT_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3029, 5064, 5160"/>
+ <method name="getType()" value="Constraint_Shape_CN, Constraint_NameLabel_CN, Constraint_FloatingNameLabel_CN"/>
</object>
<object
id="COMMENT"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2012, 5038"/>
+ <method name="getType()" value="Comment_Shape, Comment_BodyLabel"/>
</object>
<object
id="COMMENT_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3028, 5063"/>
+ <method name="getType()" value="Comment_Shape_CN, Comment_BodyLabel_CN"/>
</object>
- <!--
- "3030" = INSTANCE_SPECIFICATION_SLOT_CLN
- -->
<object
id="INSTANCE_SPECIFICATION_SLOT_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3030"/>
+ <method name="getType()" value="Slot_SlotLabel"/>
</object>
- <!--
- "4013" = COMMENT_ANNOTATED_ELEMENT
- "4014" = CONSTRAINT_CONSTRAINED_ELEMENT
- -->
<object
id="COMMENT_ANNOTATED_ELEMENT"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4013"/>
+ <method name="getType()" value="Comment_AnnotatedElementEdge"/>
</object>
<object
id="CONSTRAINT_CONSTRAINED_ELEMENT"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4014"/>
+ <method name="getType()" value="Constraint_ConstrainedElementEdge"/>
</object>
<context views="MODEL, MODEL_CN, PACKAGE, PACKAGE_CN, INSTANCE_SPECIFICATION, INSTANCE_SPECIFICATION_CN, CONSTRAINT, CONSTRAINT_CN, COMMENT, COMMENT_CN"/>
@@ -1346,29 +1288,29 @@
</mapping>
<mapping
humanReadableType="slots"
- type="7001">
+ type="InstanceSpecification_SlotCompartment">
</mapping>
<mapping
humanReadableType="slots"
- type="7035">
+ type="InstanceSpecification_SlotCompartment_CN">
</mapping>
<mapping
humanReadableType="packagedElements"
- type="7030">
+ type="Model_PackagedElementCompartment_CN">
</mapping>
<mapping
humanReadableType="packagedElements"
- type="7010">
+ type="Package_PackagedElementCompartment_CN">
</mapping>
<mapping
humanReadableType="packagedElements"
- type="7009">
+ type="Model_PackagedElementCompartment">
</mapping>
<mapping
humanReadableType="packagedElements"
- type="7016">
+ type="Package_PackagedElementCompartment">
</mapping>
</diagramMappings>
@@ -1377,10 +1319,28 @@
point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
<diagramReconciler
diagramType="BlockDefinition"
- reconcilerClass="org.eclipse.papyrus.sysml.diagram.blockdefinition.migration.BDDReconcilier"
+ reconcilerClass="org.eclipse.papyrus.sysml.diagram.blockdefinition.migration.BDDReconciler"
source="0.9.1"
target="1.1.0">
</diagramReconciler>
+ <diagramReconciler
+ diagramType="BlockDefinition"
+ reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler"
+ source="1.0.0"
+ target="1.1.0">
+ </diagramReconciler>
+ <diagramReconciler
+ diagramType="BlockDefinition"
+ reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconcilerForCompartment"
+ source="1.1.0"
+ target="1.2.0">
+ </diagramReconciler>
+ <diagramReconciler
+ diagramType="BlockDefinition"
+ reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler_1_2_0"
+ source="1.1.0"
+ target="1.2.0">
+ </diagramReconciler>
</extension>
<extension
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ElementTypes.java
index 05bf715fe09..1791880dc16 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ElementTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ElementTypes.java
@@ -16,6 +16,25 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;
import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintBodyEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintBodyEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationNameEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelNameEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelNameEditPartTN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartTN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageNameEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
public class ElementTypes extends AbstractElementTypeEnumerator {
@@ -35,83 +54,83 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
/** ClassDiagram :: MODEL */
- public static final IHintedType MODEL = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Model_2005"); //$NON-NLS-1$
+ public static final IHintedType MODEL = (IHintedType) UMLElementTypes.Model_Shape;
- public static final String MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7009"; //$NON-NLS-1$
+ public static final String MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = ModelPackageableElementCompartmentEditPartTN.VISUAL_ID;
- public static final String MODEL_LABEL_NAME_TN_HINT = "5020"; //$NON-NLS-1$
+ public static final String MODEL_LABEL_NAME_TN_HINT = ModelNameEditPartTN.VISUAL_ID;
/** ClassDiagram :: MODEL_CN */
- public static final IHintedType MODEL_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Model_3024"); //$NON-NLS-1$
+ public static final IHintedType MODEL_CN = (IHintedType) UMLElementTypes.Model_Shape_CN;
- public static final String MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7030"; //$NON-NLS-1$
+ public static final String MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = ModelPackageableElementCompartmentEditPartCN.VISUAL_ID;
- public static final String MODEL_CN_LABEL_NAME_HINT = "5052"; //$NON-NLS-1$
+ public static final String MODEL_CN_LABEL_NAME_HINT = ModelNameEditPartCN.VISUAL_ID;
/** ClassDiagram :: PACKAGE */
- public static final IHintedType PACKAGE = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_2007"); //$NON-NLS-1$
+ public static final IHintedType PACKAGE = (IHintedType) UMLElementTypes.Package_Shape;
- public static final String PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7016"; //$NON-NLS-1$
+ public static final String PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = PackagePackageableElementCompartmentEditPart.VISUAL_ID;
- public static final String PACKAGE_LABEL_NAME_HINT = "5026"; //$NON-NLS-1$
+ public static final String PACKAGE_LABEL_NAME_HINT = PackageNameEditPart.VISUAL_ID;
/** ClassDiagram :: PACKAGE_CN */
- public static final IHintedType PACKAGE_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_3009"); //$NON-NLS-1$
+ public static final IHintedType PACKAGE_CN = (IHintedType) UMLElementTypes.Package_Shape_CN;
- public static final String PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7010"; //$NON-NLS-1$
+ public static final String PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = PackagePackageableElementCompartmentEditPartCN.VISUAL_ID;
- public static final String PACKAGE_CN_LABEL_NAME_HINT = "5017"; //$NON-NLS-1$
+ public static final String PACKAGE_CN_LABEL_NAME_HINT = PackageNameEditPartCN.VISUAL_ID;
/** ClassDiagram :: INSTANCE_SPECIFICATION */
- public static final IHintedType INSTANCE_SPECIFICATION = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_2001"); //$NON-NLS-1$
+ public static final IHintedType INSTANCE_SPECIFICATION = (IHintedType) UMLElementTypes.InstanceSpecification_Shape;
/** ClassDiagram :: INSTANCE_SPECIFICATION_LINK */
- public static final IHintedType INSTANCE_SPECIFICATION_LINK = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecificationLink_4021"); //$NON-NLS-1$
+ public static final IHintedType INSTANCE_SPECIFICATION_LINK = (IHintedType) UMLElementTypes.InstanceSpecification_Edge;
- public static final String INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT = "7001"; //$NON-NLS-1$
+ public static final String INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT = InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID;
- public static final String INSTANCE_SPECIFICATION_LABEL_NAME_HINT = "5002"; //$NON-NLS-1$
+ public static final String INSTANCE_SPECIFICATION_LABEL_NAME_HINT = InstanceSpecificationNameEditPart.VISUAL_ID;
/** ClassDiagram :: INSTANCE_SPECIFICATION_CN */
- public static final IHintedType INSTANCE_SPECIFICATION_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_3020"); //$NON-NLS-1$
+ public static final IHintedType INSTANCE_SPECIFICATION_CN = (IHintedType) UMLElementTypes.InstanceSpecification_Shape_CN;
- public static final String INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT = "7035"; //$NON-NLS-1$
+ public static final String INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT = InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID;
- public static final String INSTANCE_SPECIFICATION_CN_LABEL_NAME_HINT = "5040"; //$NON-NLS-1$
+ public static final String INSTANCE_SPECIFICATION_CN_LABEL_NAME_HINT = InstanceSpecificationNameEditPartCN.VISUAL_ID;
/** ClassDiagram :: CONSTRAINT */
- public static final IHintedType CONSTRAINT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"); //$NON-NLS-1$
+ public static final IHintedType CONSTRAINT = (IHintedType) UMLElementTypes.Constraint_PackagedElementShape;
- public static final String CONSTRAINT_LABEL_NAME_HINT = "5037"; //$NON-NLS-1$
+ public static final String CONSTRAINT_LABEL_NAME_HINT = ConstraintNameEditPart.VISUAL_ID;
- public static final String CONSTRAINT_LABEL_BODY_HINT = "5159"; //$NON-NLS-1$
+ public static final String CONSTRAINT_LABEL_BODY_HINT = ConstraintBodyEditPart.VISUAL_ID;
/** ClassDiagram :: CONSTRAINT_CN */
- public static final IHintedType CONSTRAINT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"); //$NON-NLS-1$
+ public static final IHintedType CONSTRAINT_CN = (IHintedType) UMLElementTypes.Constraint_PackagedElementShape_CN;
- public static final String CONSTRAINT_CN_LABEL_NAME_HINT = "5064"; //$NON-NLS-1$
+ public static final String CONSTRAINT_CN_LABEL_NAME_HINT = ConstraintNameEditPartCN.VISUAL_ID;
- public static final String CONSTRAINT_CN_LABEL_BODY_HINT = "5160"; //$NON-NLS-1$
+ public static final String CONSTRAINT_CN_LABEL_BODY_HINT = ConstraintBodyEditPartCN.VISUAL_ID;
/** ClassDiagram :: COMMENT */
- public static final IHintedType COMMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"); //$NON-NLS-1$
+ public static final IHintedType COMMENT = (IHintedType) UMLElementTypes.Comment_Shape;
- public static final String COMMENT_LABEL_BODY_HINT = "5038"; //$NON-NLS-1$
+ public static final String COMMENT_LABEL_BODY_HINT = CommentBodyEditPart.VISUAL_ID;
/** ClassDiagram :: COMMENT_CN */
- public static final IHintedType COMMENT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"); //$NON-NLS-1$
+ public static final IHintedType COMMENT_CN = (IHintedType) UMLElementTypes.Comment_Shape_CN;
- public static final String COMMENT_CN_LABEL_BODY_HINT = "5063"; //$NON-NLS-1$
+ public static final String COMMENT_CN_LABEL_BODY_HINT = CommentBodyEditPartCN.VISUAL_ID;
/** ClassDiagram :: COMMENT_ANNOTATED_ELEMENT */
- public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"); //$NON-NLS-1$
+ public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) UMLElementTypes.Comment_AnnotatedElementEdge;
/** ClassDiagram :: CONSTRAINT_CONSTRAINED_ELEMENT */
- public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014"); //$NON-NLS-1$
+ public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType) UMLElementTypes.Constraint_ConstrainedElementEdge;
/** ClassDiagram :: ChildLabelNodes */
- public static final IHintedType INSTANCE_SPECIFICATION_SLOT_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Slot_3030"); //$NON-NLS-1$
+ public static final IHintedType INSTANCE_SPECIFICATION_SLOT_CLN = (IHintedType) UMLElementTypes.Slot_SlotLabel;
public static IElementType getElementTypeByID(String visualID) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java
index 6c7d453aa17..5255bb3b46c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java
@@ -54,10 +54,10 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
// Cannot use createEdge from super class as it never take the graphical type (semanticHint) into account.
// createdEdge = super.createEdge(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
- createdEdge = createCommentAnnotatedElement_4013(containerView, index, persisted, preferencesHint);
+ createdEdge = createComment_AnnotatedElementEdge(containerView, index, persisted, preferencesHint);
}
if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
- createdEdge = createConstraintConstrainedElement_4014(containerView, index, persisted, preferencesHint);
+ createdEdge = createConstraint_ConstrainedElementEdge(containerView, index, persisted, preferencesHint);
}
}
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/migration/BDDReconcilier.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/migration/BDDReconciler.java
index e21e0a4dac4..131f71f3343 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/migration/BDDReconcilier.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/migration/BDDReconciler.java
@@ -27,7 +27,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
/**
* Block Definition Diagram Reconciler from 0.9.1 to 1.0.0
*/
-public class BDDReconcilier extends DiagramReconciler {
+public class BDDReconciler extends DiagramReconciler {
@Override
public ICommand getReconcileCommand(Diagram diagram) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLDiagramUpdater.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLDiagramUpdater.java
index 8ebc727170d..609e8f500b5 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLDiagramUpdater.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLDiagramUpdater.java
@@ -158,7 +158,7 @@ public class SysMLDiagramUpdater {
return getAssociation_link_sysml_association_IncomingLink(view);
}
if (id.equals(PackageEditPart.VISUAL_ID) || id.equals(PackageEditPartCN.VISUAL_ID)) {
- return getPackage_2007IncomingLinks(view);
+ return getPackage_Shape_IncomingLinks(view);
}
if (id.equals(UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID)) {
return getActor_shape_uml_actor_as_classifier_IncomingLinks(view);
@@ -185,10 +185,10 @@ public class SysMLDiagramUpdater {
return getReception_shape_uml_reception_as_label_IncomingLinks(view);
}
if (id.equals(InstanceSpecificationEditPart.VISUAL_ID) || id.equals(InstanceSpecificationEditPartCN.VISUAL_ID)) {
- return getInstanceSpecification_2001IncomingLinks(view);
+ return getInstanceSpecification_Shape_IncomingLinks(view);
}
if (id.equals(SlotEditPart.VISUAL_ID)) {
- return getSlot_2001IncomingLinks(view);
+ return getSlot_SlotLabel_IncomingLinks(view);
}
if (id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {
return getDependency_link_uml_dependency_IncomingLinks(view);
@@ -280,7 +280,7 @@ public class SysMLDiagramUpdater {
return getAssociation_link_sysml_association_OutgoingLink(view);
}
if (id.equals(PackageEditPart.VISUAL_ID) || id.equals(PackageEditPartCN.VISUAL_ID)) {
- return getPackage_2007OutgoingLinks(view);
+ return getPackage_Shape_OutgoingLinks(view);
}
if (id.equals(UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID)) {
return getActor_shape_uml_actor_as_classifier_OutgoingLinks(view);
@@ -307,10 +307,10 @@ public class SysMLDiagramUpdater {
return getReception_shape_uml_reception_as_label_OutgoingLinks(view);
}
if (id.equals(InstanceSpecificationEditPart.VISUAL_ID) || id.equals(InstanceSpecificationEditPartCN.VISUAL_ID)) {
- return getInstanceSpecification_2001OutgoingLinks(view);
+ return getInstanceSpecification_Shape_OutgoingLinks(view);
}
if (id.equals(SlotEditPart.VISUAL_ID)) {
- return getSlot_2001OutgoingLinks(view);
+ return getSlot_SlotLabel_OutgoingLinks(view);
}
if (id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {
return getDependency_link_uml_dependency_OutgoingLinks(view);
@@ -385,8 +385,8 @@ public class SysMLDiagramUpdater {
Constraint modelElement = (Constraint) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
return result;
@@ -395,7 +395,7 @@ public class SysMLDiagramUpdater {
private static List<UpdaterLinkDescriptor> getConstraint_OutgoingLinks(View view) {
Constraint modelElement = (Constraint) view.getElement();
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement));
+ result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));
result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
return result;
@@ -405,15 +405,15 @@ public class SysMLDiagramUpdater {
Comment modelElement = (Comment) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
return result;
}
private static List<UpdaterLinkDescriptor> getComment_OutgoingLinks(View view) {
Comment modelElement = (Comment) view.getElement();
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement));
+ result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));
return result;
}
@@ -446,27 +446,27 @@ public class SysMLDiagramUpdater {
}
private static List<UpdaterLinkDescriptor> getDimension_shape_sysml_dimension_as_classifier_OutgoingLinks(View view) {
- return getInstanceSpecification_2001IncomingLinks(view);
+ return getInstanceSpecification_Shape_IncomingLinks(view);
}
private static List<UpdaterLinkDescriptor> getDimension_shape_sysml_dimension_as_classifier_IncomingLinks(View view) {
- return getInstanceSpecification_2001OutgoingLinks(view);
+ return getInstanceSpecification_Shape_OutgoingLinks(view);
}
private static List<UpdaterLinkDescriptor> getUnit_shape_sysml_unit_as_classifier_OutgoingLinks(View view) {
- return getInstanceSpecification_2001IncomingLinks(view);
+ return getInstanceSpecification_Shape_IncomingLinks(view);
}
private static List<UpdaterLinkDescriptor> getUnit_shape_sysml_unit_as_classifier_IncomingLinks(View view) {
- return getInstanceSpecification_2001OutgoingLinks(view);
+ return getInstanceSpecification_Shape_OutgoingLinks(view);
}
private static List<UpdaterLinkDescriptor> getPrimitiveType_shape_uml_primitivetype_as_classifier_IncomingLinks(View view) {
PrimitiveType modelElement = (PrimitiveType) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
@@ -490,8 +490,8 @@ public class SysMLDiagramUpdater {
EnumerationLiteral modelElement = (EnumerationLiteral) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
return result;
@@ -509,8 +509,8 @@ public class SysMLDiagramUpdater {
Enumeration modelElement = (Enumeration) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
@@ -532,8 +532,8 @@ public class SysMLDiagramUpdater {
DataType modelElement = (DataType) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
@@ -555,8 +555,8 @@ public class SysMLDiagramUpdater {
Usage modelElement = (Usage) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
return result;
@@ -574,8 +574,8 @@ public class SysMLDiagramUpdater {
InterfaceRealization modelElement = (InterfaceRealization) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
return result;
@@ -617,13 +617,13 @@ public class SysMLDiagramUpdater {
Interface modelElement = (Interface) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferencer));
- result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4003(modelElement, crossReferencer));
+ result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));
return result;
}
@@ -673,8 +673,8 @@ public class SysMLDiagramUpdater {
Dependency modelElement = (Dependency) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
return result;
@@ -692,8 +692,8 @@ public class SysMLDiagramUpdater {
Generalization modelElement = (Generalization) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
return result;
}
@@ -701,31 +701,31 @@ public class SysMLDiagramUpdater {
return Collections.emptyList();
}
- private static List<UpdaterLinkDescriptor> getSlot_2001IncomingLinks(View view) {
+ private static List<UpdaterLinkDescriptor> getSlot_SlotLabel_IncomingLinks(View view) {
Slot modelElement = (Slot) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
return result;
}
- private static List<UpdaterLinkDescriptor> getSlot_2001OutgoingLinks(View view) {
+ private static List<UpdaterLinkDescriptor> getSlot_SlotLabel_OutgoingLinks(View view) {
return Collections.emptyList();
}
- private static List<UpdaterLinkDescriptor> getInstanceSpecification_2001IncomingLinks(View view) {
+ private static List<UpdaterLinkDescriptor> getInstanceSpecification_Shape_IncomingLinks(View view) {
InstanceSpecification modelElement = (InstanceSpecification) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
return result;
}
- private static List<UpdaterLinkDescriptor> getInstanceSpecification_2001OutgoingLinks(View view) {
+ private static List<UpdaterLinkDescriptor> getInstanceSpecification_Shape_OutgoingLinks(View view) {
InstanceSpecification modelElement = (InstanceSpecification) view.getElement();
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
@@ -737,8 +737,8 @@ public class SysMLDiagramUpdater {
Reception modelElement = (Reception) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
return result;
@@ -756,8 +756,8 @@ public class SysMLDiagramUpdater {
Operation modelElement = (Operation) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
return result;
@@ -804,7 +804,7 @@ public class SysMLDiagramUpdater {
return getProperty_OutgoingLinks(view);
}
- private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InterfaceRealization_4003(Interface target, CrossReferenceAdapter crossReferencer) {
+ private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(Interface target, CrossReferenceAdapter crossReferencer) {
LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
for (EStructuralFeature.Setting setting : settings) {
@@ -819,7 +819,7 @@ public class SysMLDiagramUpdater {
continue;
}
BehavioredClassifier container = (BehavioredClassifier) link.eContainer();
- result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.InterfaceRealization_4003, InterfaceRealizationEditPart.VISUAL_ID));
+ result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.InterfaceRealization_Edge, InterfaceRealizationEditPart.VISUAL_ID));
}
return result;
}
@@ -828,8 +828,8 @@ public class SysMLDiagramUpdater {
Property modelElement = (Property) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
return result;
@@ -848,8 +848,8 @@ public class SysMLDiagramUpdater {
Signal modelElement = (Signal) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
@@ -872,8 +872,8 @@ public class SysMLDiagramUpdater {
Actor modelElement = (Actor) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
@@ -890,18 +890,18 @@ public class SysMLDiagramUpdater {
return result;
}
- public static List<UpdaterLinkDescriptor> getPackage_2007IncomingLinks(View view) {
+ public static List<UpdaterLinkDescriptor> getPackage_Shape_IncomingLinks(View view) {
Package modelElement = (Package) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
return result;
}
- public static List<UpdaterLinkDescriptor> getPackage_2007OutgoingLinks(View view) {
+ public static List<UpdaterLinkDescriptor> getPackage_Shape_OutgoingLinks(View view) {
Package modelElement = (Package) view.getElement();
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
@@ -918,8 +918,8 @@ public class SysMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
return result;
}
@@ -942,8 +942,8 @@ public class SysMLDiagramUpdater {
result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
return result;
}
@@ -974,7 +974,7 @@ public class SysMLDiagramUpdater {
continue;
}
NamedElement src = (NamedElement) theSource;
- result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_4008, null));
+ result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_Edge, null));
}
return result;
}
@@ -991,7 +991,7 @@ public class SysMLDiagramUpdater {
continue;
}
Interface dst = link.getContract();
- result.add(new UpdaterLinkDescriptor(container, dst, link, UMLElementTypes.InterfaceRealization_4003, null));
+ result.add(new UpdaterLinkDescriptor(container, dst, link, UMLElementTypes.InterfaceRealization_Edge, null));
}
return result;
}
@@ -1013,7 +1013,7 @@ public class SysMLDiagramUpdater {
continue;
}
NamedElement src = (NamedElement) theSource;
- result.add(new UpdaterLinkDescriptor(src, target, link, UMLElementTypes.Usage_4007, null));
+ result.add(new UpdaterLinkDescriptor(src, target, link, UMLElementTypes.Usage_Edge, null));
}
return result;
}
@@ -1021,11 +1021,11 @@ public class SysMLDiagramUpdater {
/**
* @generated
*/
- private static Collection<UpdaterLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(Comment source) {
+ private static Collection<UpdaterLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(Comment source) {
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
for (Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) {
Element destination = (Element) destinations.next();
- result.add(new UpdaterLinkDescriptor(source, destination, UMLElementTypes.CommentAnnotatedElement_4013, CommentAnnotatedElementEditPart.VISUAL_ID));
+ result.add(new UpdaterLinkDescriptor(source, destination, UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID));
}
return result;
}
@@ -1033,11 +1033,11 @@ public class SysMLDiagramUpdater {
/**
* @generated
*/
- private static Collection<UpdaterLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(Constraint source) {
+ private static Collection<UpdaterLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(Constraint source) {
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
for (Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) {
Element destination = (Element) destinations.next();
- result.add(new UpdaterLinkDescriptor(source, destination, UMLElementTypes.ConstraintConstrainedElement_4014, ConstraintConstrainedElementEditPart.VISUAL_ID));
+ result.add(new UpdaterLinkDescriptor(source, destination, UMLElementTypes.Constraint_ConstrainedElementEdge, ConstraintConstrainedElementEditPart.VISUAL_ID));
}
return result;
}
@@ -1045,12 +1045,12 @@ public class SysMLDiagramUpdater {
/**
* @generated
*/
- private static Collection<UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(Element target, CrossReferenceAdapter crossReferencer) {
+ private static Collection<UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(Element target, CrossReferenceAdapter crossReferencer) {
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
for (EStructuralFeature.Setting setting : settings) {
if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) {
- result.add(new UpdaterLinkDescriptor(setting.getEObject(), target, UMLElementTypes.CommentAnnotatedElement_4013, CommentAnnotatedElementEditPart.VISUAL_ID));
+ result.add(new UpdaterLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID));
}
}
return result;
@@ -1059,12 +1059,12 @@ public class SysMLDiagramUpdater {
/**
* @generated
*/
- private static Collection<UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(Element target, CrossReferenceAdapter crossReferencer) {
+ private static Collection<UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(Element target, CrossReferenceAdapter crossReferencer) {
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
for (EStructuralFeature.Setting setting : settings) {
if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) {
- result.add(new UpdaterLinkDescriptor(setting.getEObject(), target, UMLElementTypes.ConstraintConstrainedElement_4014, ConstraintConstrainedElementEditPart.VISUAL_ID));
+ result.add(new UpdaterLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Constraint_ConstrainedElementEdge, ConstraintConstrainedElementEditPart.VISUAL_ID));
}
}
return result;
@@ -1109,7 +1109,7 @@ public class SysMLDiagramUpdater {
if (src != source) {
continue;
}
- result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Usage_4007, null));
+ result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Usage_Edge, null));
}
return result;
}
@@ -1152,7 +1152,7 @@ public class SysMLDiagramUpdater {
if (src != source) {
continue;
}
- result.add(new UpdaterLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4008, null));
+ result.add(new UpdaterLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge, null));
}
return result;
}
@@ -1169,7 +1169,7 @@ public class SysMLDiagramUpdater {
continue;
}
Classifier dst = link.getGeneral();
- result.add(new UpdaterLinkDescriptor(container, dst, link, UMLElementTypes.Generalization_4002, null));
+ result.add(new UpdaterLinkDescriptor(container, dst, link, UMLElementTypes.Generalization_Edge, null));
}
return result;
}
@@ -1189,7 +1189,7 @@ public class SysMLDiagramUpdater {
continue;
}
Classifier container = (Classifier) link.eContainer();
- result.add(new UpdaterLinkDescriptor(container, target, link, UMLElementTypes.Generalization_4002, null));
+ result.add(new UpdaterLinkDescriptor(container, target, link, UMLElementTypes.Generalization_Edge, null));
}
return result;
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintNodeLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintNodeLabelEditPart.java
index ecc2f181898..a1edc3230f8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintNodeLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintNodeLabelEditPart.java
@@ -331,7 +331,7 @@ public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart impl
@Override
public IParser getParser() {
if (parser == null) {
- parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3120, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPartCN.VISUAL_ID));
+ parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_Shape_CN, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPartCN.VISUAL_ID));
}
return parser;
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.gen.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.gen.xml
index 64fc80461ad..388b6e10ed8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.gen.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.gen.xml
@@ -246,19 +246,9 @@
<viewProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.InheritedCompositeDiagramViewProvider">
<Priority name="Low"/>
- <!--
- "2114" = CONSTRAINT
- "3097" = COMMENT_CN
- "2109" = COMMENT
- "3120" = CONSTRAINT_CN
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2114, 3097, 2109, 3120"/>
-
- <!--
- "4002" = COMMENT_ANNOTATED_ELEMENT
- "4003" = CONSTRAINT_CONSTRAINED_ELEMENT
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4002, 4003"/>
+ <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Constraint_Shape, Comment_Shape_CN, Comment_Shape, Constraint_Shape_CN"/>
+
+ <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge"/>
<!-- Additional descriptors provided in case the semantic hint is is not provided -->
@@ -324,55 +314,37 @@
<!-- EditPartProvider for inherited elements (from CompositeDiagram) -->
<editpartProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.InheritedCompositeDiagramEditPartProvider">
<Priority name="Low"/>
- <!--
- The semantic hints given here are used in case the provider is not already loaded.
- As soon as the provider is loaded its provides method is used.
- "2114" = CONSTRAINT
- "5197" = CONSTRAINT_LABEL_NAME_HINT
- "6039" = CONSTRAINT_LABEL_SPECIFICATION_HINT
- "3097" = COMMENT_CN
- "5150" = COMMENT_CN_LABEL_BODY_HINT
- "2109" = COMMENT
- "5192" = COMMENT_LABEL_BODY_HINT
- "3120" = CONSTRAINT_CN
- "6048" = CONSTRAINT_CN_LABEL_NAME_HINT
- "6049" = CONSTRAINT_CN_LABEL_SPECIFICATION_HINT
- -->
<object
id="CONSTRAINT"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2114, 5197, 6039"/>
+ <method name="getType()" value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"/>
</object>
<object
id="COMMENT_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3097, 5150"/>
+ <method name="getType()" value="Comment_Shape_CN, Comment_BodyLabel_CN"/>
</object>
<object
id="COMMENT"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2109, 5192"/>
+ <method name="getType()" value="Comment_Shape, Comment_BodyLabel"/>
</object>
<object
id="CONSTRAINT_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3120, 6048, 6049"/>
+ <method name="getType()" value="Constraint_Shape_CN, Constraint_NameLabel_CN, Constraint_BodyLabel_CN"/>
</object>
- <!--
- "4002" = COMMENT_ANNOTATED_ELEMENT
- "4003" = CONSTRAINT_CONSTRAINED_ELEMENT
- -->
<object
id="COMMENT_ANNOTATED_ELEMENT"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4002"/>
+ <method name="getType()" value="Comment_AnnotatedElementEdge"/>
</object>
<object
id="CONSTRAINT_CONSTRAINED_ELEMENT"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4003"/>
+ <method name="getType()" value="Constraint_ConstrainedElementEdge"/>
</object>
<context views="CONSTRAINT, COMMENT_CN, COMMENT, CONSTRAINT_CN"/>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
index e249da1e89b..e4a8051a692 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
@@ -216,19 +216,9 @@
<!-- Load the ViewProvider on following SemanticHint related to IElementType(s) used in the palette (also used for legacy elements) -->
<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="UML::Comment, UML::Constraint"></context>
- <!--
- "2109" = COMMENT
- "3097" = COMMENT_CN
- "2114" = CONSTRAINT
- "3120" = CONSTRAINT_CN
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2109, 3097, 2114, 3120"></context>
+ <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Comment_Shape, Comment_Shape_CN, Constraint_Shape, Constraint_Shape_CN"></context>
- <!--
- "4002" = COMMENT_ANNOTATED_ELEMENT
- "4003" = CONSTRAINT_CONSTRAINED_ELEMENT
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4002, 4003"></context>
+ <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge"></context>
<!-- Additional descriptors provided in case the semantic hint is is not provided -->
@@ -288,42 +278,24 @@
<editpartProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.InheritedCompositeDiagramEditPartProvider">
<Priority name="Low"></Priority>
- <!--
- The semantic hints given here are used in case the provider is not already loaded.
- As soon as the provider is loaded its provides method is used.
- "2109" = COMMENT
- "5192" = COMMENT_LABEL_BODY_HINT
- "3097" = COMMENT_CN
- "5150" = COMMENT_CN_LABEL_BODY_HINT
- "2114" = CONSTRAINT
- "5197" = CONSTRAINT_LABEL_NAME_HINT
- "6039" = CONSTRAINT_LABEL_SPECIFICATION_HINT
- "3120" = CONSTRAINT_CN
- "6048" = CONSTRAINT_CN_LABEL_NAME_HINT
- "6049" = CONSTRAINT_CN_LABEL_SPECIFICATION_HINT
- -->
<object id="COMMENT" class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2109, 5192"></method>
+ <method name="getType()" value="Comment_Shape, Comment_BodyLabel"></method>
</object>
<object id="COMMENT_CN" class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3097, 5150"></method>
+ <method name="getType()" value="Comment_Shape_CN, Comment_BodyLabel_CN"></method>
</object>
<object id="CONSTRAINT" class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2114, 5197, 6039"></method>
+ <method name="getType()" value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"></method>
</object>
<object id="CONSTRAINT_CN" class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3120, 6048, 6049"></method>
+ <method name="getType()" value="Constraint_Shape_CN, Constraint_NameLabel_CN, Constraint_BodyLabel_CN"></method>
</object>
- <!--
- "4002" = COMMENT_ANNOTATED_ELEMENT
- "4003" = CONSTRAINT_CONSTRAINED_ELEMENT
- -->
<object id="COMMENT_ANNOTATED_ELEMENT" class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4002"></method>
+ <method name="getType()" value="Comment_AnnotatedElementEdge"></method>
</object>
<object id="CONSTRAINT_CONSTRAINED_ELEMENT" class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4003"></method>
+ <method name="getType()" value="Constraint_ConstrainedElementEdge"></method>
</object>
<context views="COMMENT, COMMENT_CN, CONSTRAINT, CONSTRAINT_CN"></context>
@@ -558,10 +530,28 @@
<extension id="org.eclipse.papyrus.sysml.diagram.internalblock.migration" name="InternalBlockMigration" point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
<diagramReconciler
diagramType="InternalBlock"
- reconcilerClass="org.eclipse.papyrus.sysml.diagram.internalblock.migration.InternalBlockDiagramReconcilierUndefinedTo100"
+ reconcilerClass="org.eclipse.papyrus.sysml.diagram.internalblock.migration.InternalBlockDiagramReconcilerUndefinedTo100"
source="undefined"
target="1.1.0">
</diagramReconciler>
+ <diagramReconciler
+ diagramType="InternalBlock"
+ reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler"
+ source="undefined"
+ target="1.1.0">
+ </diagramReconciler>
+ <diagramReconciler
+ diagramType="InternalBlock"
+ reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconcilerForCompartment"
+ source="undefined"
+ target="1.2.0">
+ </diagramReconciler>
+ <diagramReconciler
+ diagramType="InternalBlock"
+ reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler_1_2_0"
+ source="undefined"
+ target="1.2.0">
+ </diagramReconciler>
</extension>
<extension
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java
index f1c365d9fe6..06aad1007f6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java
@@ -15,6 +15,13 @@ package org.eclipse.papyrus.sysml.diagram.internalblock.provider;
import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentBodyEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentBodyEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintNameEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintNameEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
public class ElementTypes extends AbstractElementTypeEnumerator {
@@ -23,40 +30,40 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
/** ********************************************************* */
/** SysML Internal Block Diagram :: Diagram */
- public static final String DIAGRAM_ID = "InternalBlock"; //$NON-NLS-1$
+ public static final String DIAGRAM_ID = "InternalBlock";
/** ********************************************************* */
/** SysML Internal Block Diagram - CompositeDiagram related elements */
/** ********************************************************* */
/** CompositeDiagram :: CONSTRAINT */
- public static final IHintedType CONSTRAINT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"); //$NON-NLS-1$
+ public static final IHintedType CONSTRAINT = (IHintedType) UMLElementTypes.Constraint_Shape;
- public static final String CONSTRAINT_LABEL_NAME_HINT = "5197"; //$NON-NLS-1$
+ public static final String CONSTRAINT_LABEL_NAME_HINT = ConstraintNameEditPart.VISUAL_ID;
- public static final String CONSTRAINT_LABEL_SPECIFICATION_HINT = "6039"; //$NON-NLS-1$
+ public static final String CONSTRAINT_LABEL_SPECIFICATION_HINT = ConstraintSpecificationEditPart.VISUAL_ID;
/** CompositeDiagram :: COMMENT_CN */
- public static final IHintedType COMMENT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_3097"); //$NON-NLS-1$
+ public static final IHintedType COMMENT_CN = (IHintedType) UMLElementTypes.Comment_Shape_CN;
- public static final String COMMENT_CN_LABEL_BODY_HINT = "5150"; //$NON-NLS-1$
+ public static final String COMMENT_CN_LABEL_BODY_HINT = CommentBodyEditPartCN.VISUAL_ID;
/** CompositeDiagram :: COMMENT */
- public static final IHintedType COMMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_2109"); //$NON-NLS-1$
+ public static final IHintedType COMMENT = (IHintedType) UMLElementTypes.Comment_Shape;
- public static final String COMMENT_LABEL_BODY_HINT = "5192"; //$NON-NLS-1$
+ public static final String COMMENT_LABEL_BODY_HINT = CommentBodyEditPart.VISUAL_ID;
/** CompositeDiagram :: CONSTRAINT_CN */
- public static final IHintedType CONSTRAINT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"); //$NON-NLS-1$
+ public static final IHintedType CONSTRAINT_CN = (IHintedType) UMLElementTypes.Constraint_Shape_CN;
- public static final String CONSTRAINT_CN_LABEL_NAME_HINT = "6048"; //$NON-NLS-1$
+ public static final String CONSTRAINT_CN_LABEL_NAME_HINT = ConstraintNameEditPartCN.VISUAL_ID;
- public static final String CONSTRAINT_CN_LABEL_SPECIFICATION_HINT = "6049"; //$NON-NLS-1$
+ public static final String CONSTRAINT_CN_LABEL_SPECIFICATION_HINT = ConstraintSpecificationEditPartCN.VISUAL_ID;
/** CompositeDiagram :: COMMENT_ANNOTATED_ELEMENT */
- public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"); //$NON-NLS-1$
+ public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) UMLElementTypes.Comment_AnnotatedElementEdge;
/** CompositeDiagram :: CONSTRAINT_CONSTRAINED_ELEMENT */
- public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"); //$NON-NLS-1$
+ public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType) UMLElementTypes.Constraint_ConstrainedElementEdge;
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java
index 166dabffec5..ddecbff759b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java
@@ -56,10 +56,10 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
// Cannot use createEdge from super class as it never take the graphical type (semanticHint) into account.
// createdEdge = super.createEdge(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
- createdEdge = createCommentAnnotatedElement_4002(containerView, index, persisted, preferencesHint);
+ createdEdge = createComment_AnnotatedElementEdge(containerView, index, persisted, preferencesHint);
}
if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
- createdEdge = createConstraintConstrainedElement_4003(containerView, index, persisted, preferencesHint);
+ createdEdge = createConstraint_ConstrainedElementEdge(containerView, index, persisted, preferencesHint);
}
}
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/compatibility/DiagramVersionUpdater.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/compatibility/DiagramVersionUpdater.java
index d36e2513e09..d2e9efa8d09 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/compatibility/DiagramVersionUpdater.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/compatibility/DiagramVersionUpdater.java
@@ -20,7 +20,7 @@ import org.eclipse.papyrus.gmf.diagram.common.compatibility.IDiagramVersionUpdat
* Diagram version updater for the Internal Block Diagram.*
*
* @Deprecated
- * @link org.eclipse.papyrus.sysml.diagram.internalblock.migration.InternalBlockDiagramReconcilierUndefinedTo100
+ * @link org.eclipse.papyrus.sysml.diagram.internalblock.migration.InternalBlockDiagramReconcilerUndefinedTo100
*/
@Deprecated
public class DiagramVersionUpdater implements IDiagramVersionUpdater {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/InternalBlockDiagramReconcilierUndefinedTo100.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/InternalBlockDiagramReconcilerUndefinedTo100.java
index 31060d40c1f..be93010189f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/InternalBlockDiagramReconcilierUndefinedTo100.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/InternalBlockDiagramReconcilerUndefinedTo100.java
@@ -46,7 +46,7 @@ import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
/**
* Internal Block Diagram Reconciler from undefined to 1.0.0
*/
-public class InternalBlockDiagramReconcilierUndefinedTo100 extends DiagramReconciler {
+public class InternalBlockDiagramReconcilerUndefinedTo100 extends DiagramReconciler {
@Override
public ICommand getReconcileCommand(Diagram diagram) {
@@ -75,17 +75,17 @@ public class InternalBlockDiagramReconcilierUndefinedTo100 extends DiagramReconc
private void initializeMappings() {
- conversionMapping.put(OldElementTypes.CLASS.getSemanticHint(), SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID);
+ conversionMapping.put(OldElementTypes.CLASS_HINT, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID);
conversionMapping.put(OldElementTypes.CLASS_LABEL_COMPOSITE_NAME_HINT, SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID);
conversionMapping.put(OldElementTypes.CLASS_COMPARTMENT_STRUCTURE_HINT, SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID);
- conversionMapping.put(OldElementTypes.PROPERTY_CN.getSemanticHint(), SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID);
+ conversionMapping.put(OldElementTypes.PROPERTY_CN_HINT, SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID);
conversionMapping.put(OldElementTypes.PROPERTY_CN_LABEL_PART_NAME_HINT, UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID);
conversionMapping.put(OldElementTypes.PROPERTY_CN_COMPARTMENT_STRUCTURE_HINT, SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID);
conversionMapping.put(OldElementTypes.PORT_CN_LABEL_APPLIED_STEREOTYPE_HINT, UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID);
- conversionMapping.put(OldElementTypes.CONNECTOR.getSemanticHint(), UMLGraphicalTypes.LINK_UML_CONNECTOR_ID);
+ conversionMapping.put(OldElementTypes.CONNECTOR_HINT, UMLGraphicalTypes.LINK_UML_CONNECTOR_ID);
conversionMapping.put(OldElementTypes.CONNECTOR_LABEL_APPLIED_STEREOTYPE_HINT, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID);
conversionMapping.put(OldElementTypes.CONNECTOR_LABEL_NAME_HINT, UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID);
conversionMapping.put(OldElementTypes.CONNECTOR_LABEL_MULTIPLICITY_SOURCE_HINT, UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID);
@@ -111,7 +111,7 @@ public class InternalBlockDiagramReconcilierUndefinedTo100 extends DiagramReconc
View currentView = (View) currentEObject;
if (conversionMapping.containsKey(currentView.getType())) {
- if (currentView.getType().equals(OldElementTypes.CLASS.getSemanticHint())) {
+ if (currentView.getType().equals(OldElementTypes.CLASS_HINT)) {
blockViews.add(currentView);
}
@@ -119,7 +119,7 @@ public class InternalBlockDiagramReconcilierUndefinedTo100 extends DiagramReconc
}
// Port require specific conversion
- if (currentView.getType().equals(OldElementTypes.PORT_CN.getSemanticHint()) || currentView.getType().equals(OldElementTypes.PORT_CN_LABEL_NAME_HINT)) {
+ if (currentView.getType().equals(OldElementTypes.PORT_CN_HINT) || currentView.getType().equals(OldElementTypes.PORT_CN_LABEL_NAME_HINT)) {
portViews.add(currentView);
}
}
@@ -131,7 +131,7 @@ public class InternalBlockDiagramReconcilierUndefinedTo100 extends DiagramReconc
if (((ISpecializationType) SysMLElementTypes.FLOW_PORT).getMatcher().matches(eObject)) {
- if (portView.getType().equals(OldElementTypes.PORT_CN.getSemanticHint())) {
+ if (portView.getType().equals(OldElementTypes.PORT_CN_HINT)) {
portView.setType(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID);
}
@@ -141,7 +141,7 @@ public class InternalBlockDiagramReconcilierUndefinedTo100 extends DiagramReconc
} else { // if (eObject instanceof Port)
- if (portView.getType().equals(OldElementTypes.PORT_CN.getSemanticHint())) {
+ if (portView.getType().equals(OldElementTypes.PORT_CN_HINT)) {
portView.setType(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID);
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/OldElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/OldElementTypes.java
index 8aef5d4843c..57209961a93 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/OldElementTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/OldElementTypes.java
@@ -22,28 +22,28 @@ import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
public class OldElementTypes extends AbstractElementTypeEnumerator {
/** CompositeDiagram :: CLASS */
- public static final IHintedType CLASS = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Class_2073"); //$NON-NLS-1$
+ public static final String CLASS_HINT = "2073"; //$NON-NLS-1$
public static final String CLASS_COMPARTMENT_STRUCTURE_HINT = "7073"; //$NON-NLS-1$
public static final String CLASS_LABEL_COMPOSITE_NAME_HINT = "5156"; //$NON-NLS-1$
/** CompositeDiagram :: PORT_CN */
- public static final IHintedType PORT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Port_3069"); //$NON-NLS-1$
+ public static final String PORT_CN_HINT = "3069"; //$NON-NLS-1$
public static final String PORT_CN_LABEL_NAME_HINT = "5125"; //$NON-NLS-1$
public static final String PORT_CN_LABEL_APPLIED_STEREOTYPE_HINT = "6029"; //$NON-NLS-1$
/** CompositeDiagram :: PROPERTY_CN */
- public static final IHintedType PROPERTY_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Property_3070"); //$NON-NLS-1$
+ public static final String PROPERTY_CN_HINT = "3070"; //$NON-NLS-1$
public static final String PROPERTY_CN_COMPARTMENT_STRUCTURE_HINT = "7077"; //$NON-NLS-1$
public static final String PROPERTY_CN_LABEL_PART_NAME_HINT = "5126"; //$NON-NLS-1$
/** CompositeDiagram :: CONNECTOR */
- public static final IHintedType CONNECTOR = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Connector_4013"); //$NON-NLS-1$
+ public static final String CONNECTOR_HINT = "4013"; //$NON-NLS-1$
public static final String CONNECTOR_LABEL_APPLIED_STEREOTYPE_HINT = "6025"; //$NON-NLS-1$
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLDiagramUpdater.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLDiagramUpdater.java
index 9d6d6db1aae..0063255da82 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLDiagramUpdater.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLDiagramUpdater.java
@@ -144,16 +144,16 @@ public class SysMLDiagramUpdater {
return getConnector_link_uml_connector_IncomingLink(view);
}
if (id.equals(CommentEditPart.VISUAL_ID)) {
- return getComment_2109IncomingLinks(view);
+ return getComment_Shape_IncomingLinks(view);
}
if (id.equals(CommentEditPartCN.VISUAL_ID)) {
- return getComment_3097IncomingLinks(view);
+ return getComment_Shape_CN_IncomingLinks(view);
}
if (id.equals(ConstraintEditPart.VISUAL_ID)) {
- return getConstraint_2114IncomingLinks(view);
+ return getConstraint_Shape_IncomingLinks(view);
}
if (id.equals(ConstraintEditPartCN.VISUAL_ID)) {
- return getConstraint_3120IncomingLinks(view);
+ return getConstraint_Shape_CN_IncomingLinks(view);
}
return Collections.emptyList();
}
@@ -186,16 +186,16 @@ public class SysMLDiagramUpdater {
return getConnector_link_uml_connector_OutgoingLink(view);
}
if (id.equals(CommentEditPart.VISUAL_ID)) {
- return getComment_2109OutgoingLinks(view);
+ return getComment_Shape_OutgoingLinks(view);
}
if (id.equals(CommentEditPartCN.VISUAL_ID)) {
- return getComment_3097OutgoingLinks(view);
+ return getComment_Shape_CN_OutgoingLinks(view);
}
if (id.equals(ConstraintEditPart.VISUAL_ID)) {
- return getConstraint_2114OutgoingLinks(view);
+ return getConstraint_Shape_OutgoingLinks(view);
}
if (id.equals(ConstraintEditPartCN.VISUAL_ID)) {
- return getConstraint_3120OutgoingLinks(view);
+ return getConstraint_Shape_CN_OutgoingLinks(view);
}
return Collections.emptyList();
}
@@ -204,8 +204,8 @@ public class SysMLDiagramUpdater {
Connector modelElement = (Connector) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetsLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
return result;
@@ -222,8 +222,8 @@ public class SysMLDiagramUpdater {
Dependency modelElement = (Dependency) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetsLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
return result;
}
@@ -236,72 +236,72 @@ public class SysMLDiagramUpdater {
}
- private static List<UpdaterLinkDescriptor> getComment_3097IncomingLinks(View view) {
+ private static List<UpdaterLinkDescriptor> getComment_Shape_CN_IncomingLinks(View view) {
Comment modelElement = (Comment) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
return result;
}
- private static List<UpdaterLinkDescriptor> getComment_3097OutgoingLinks(View view) {
+ private static List<UpdaterLinkDescriptor> getComment_Shape_CN_OutgoingLinks(View view) {
Comment modelElement = (Comment) view.getElement();
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));
+ result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));
return result;
}
- private static List<UpdaterLinkDescriptor> getComment_2109IncomingLinks(View view) {
+ private static List<UpdaterLinkDescriptor> getComment_Shape_IncomingLinks(View view) {
Comment modelElement = (Comment) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
return result;
}
- private static List<UpdaterLinkDescriptor> getComment_2109OutgoingLinks(View view) {
+ private static List<UpdaterLinkDescriptor> getComment_Shape_OutgoingLinks(View view) {
Comment modelElement = (Comment) view.getElement();
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));
+ result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));
return result;
}
- private static List<UpdaterLinkDescriptor> getConstraint_2114IncomingLinks(View view) {
+ private static List<UpdaterLinkDescriptor> getConstraint_Shape_IncomingLinks(View view) {
Constraint modelElement = (Constraint) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetsLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
return result;
}
- private static List<UpdaterLinkDescriptor> getConstraint_2114OutgoingLinks(View view) {
+ private static List<UpdaterLinkDescriptor> getConstraint_Shape_OutgoingLinks(View view) {
Constraint modelElement = (Constraint) view.getElement();
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));
+ result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));
result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
return result;
}
- private static List<UpdaterLinkDescriptor> getConstraint_3120IncomingLinks(View view) {
+ private static List<UpdaterLinkDescriptor> getConstraint_Shape_CN_IncomingLinks(View view) {
Constraint modelElement = (Constraint) view.getElement();
CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetsLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
return result;
}
- private static List<UpdaterLinkDescriptor> getConstraint_3120OutgoingLinks(View view) {
+ private static List<UpdaterLinkDescriptor> getConstraint_Shape_CN_OutgoingLinks(View view) {
Constraint modelElement = (Constraint) view.getElement();
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
- result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));
+ result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));
return result;
}
@@ -310,8 +310,8 @@ public class SysMLDiagramUpdater {
final CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
result.addAll(getIncomingTypeModelFacetsLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
return result;
}
@@ -333,8 +333,8 @@ public class SysMLDiagramUpdater {
final Property modelElement = (Property) view.getElement();
final CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
- result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));
- result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+ result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetsLinks_Connector_link_uml_connector(modelElement, crossReferencer));
result.addAll(getIncomingTypeModelFacetsLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
return result;
@@ -356,44 +356,44 @@ public class SysMLDiagramUpdater {
return result;
}
- private static Collection<? extends UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(final Element target, final CrossReferenceAdapter crossReferencer) {
+ private static Collection<? extends UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(final Element target, final CrossReferenceAdapter crossReferencer) {
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
for (EStructuralFeature.Setting setting : settings) {
if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) {
- result.add(new UpdaterLinkDescriptor(setting.getEObject(), target, UMLElementTypes.CommentAnnotatedElement_4002, CommentAnnotatedElementEditPart.VISUAL_ID));
+ result.add(new UpdaterLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID));
}
}
return result;
}
- private static Collection<UpdaterLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(Comment source) {
+ private static Collection<UpdaterLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(Comment source) {
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
for (Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) {
Element destination = (Element) destinations.next();
- result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.CommentAnnotatedElement_4002, CommentAnnotatedElementEditPart.VISUAL_ID));
+ result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID));
}
return result;
}
- private static Collection<UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(Element target, CrossReferenceAdapter crossReferencer) {
+ private static Collection<UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(Element target, CrossReferenceAdapter crossReferencer) {
LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
for (EStructuralFeature.Setting setting : settings) {
if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) {
- result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.ConstraintConstrainedElement_4003, ConstraintConstrainedElementEditPart.VISUAL_ID));
+ result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Constraint_ConstrainedElementEdge, ConstraintConstrainedElementEditPart.VISUAL_ID));
}
}
return result;
}
- private static Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(Constraint source) {
+ private static Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(Constraint source) {
LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
for (Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) {
Element destination = (Element) destinations.next();
- result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.ConstraintConstrainedElement_4003, ConstraintConstrainedElementEditPart.VISUAL_ID));
+ result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Constraint_ConstrainedElementEdge, ConstraintConstrainedElementEditPart.VISUAL_ID));
}
return result;
}
@@ -441,7 +441,7 @@ public class SysMLDiagramUpdater {
continue;
}
final ConnectableElement src = current.getRole();
- result.add(new UpdaterLinkDescriptor(src, target, connector, org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.Connector_4013, null));
+ result.add(new UpdaterLinkDescriptor(src, target, connector, org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.Connector_Edge, null));
}
}
return result;
@@ -470,7 +470,7 @@ public class SysMLDiagramUpdater {
continue;
}
NamedElement src = (NamedElement) theSource;
- result.add(new UpdaterLinkDescriptor(src, target, link, org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.Dependency_4010, null));
+ result.add(new UpdaterLinkDescriptor(src, target, link, org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.Dependency_Edge, null));
}
return result;
}
@@ -513,7 +513,7 @@ public class SysMLDiagramUpdater {
if (src != source) {
continue;
}
- result.add(new UpdaterLinkDescriptor(src, dst, link, org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.Dependency_4010, null));
+ result.add(new UpdaterLinkDescriptor(src, dst, link, org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.Dependency_Edge, null));
}
return result;
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.classpath b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.classpath
index 59cf3977c7e..f0c55498599 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.classpath
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-gen"/>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.settings/org.eclipse.jdt.core.prefs
index c585cc455ae..f08be2b06c4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
index f6263dbe6a3..d0239d5c67b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
@@ -434,19 +434,9 @@
<!-- Load the ViewProvider on following SemanticHint related to IElementType(s) used in the palette (also used for legacy elements) -->
<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="UML::Comment, UML::Constraint"></context>
- <!--
- "2109" = COMMENT
- "3097" = COMMENT_CN
- "2114" = CONSTRAINT
- "3120" = CONSTRAINT_CN
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2109, 3097, 2114, 3120"></context>
-
- <!--
- "4002" = COMMENT_ANNOTATED_ELEMENT
- "4003" = CONSTRAINT_CONSTRAINED_ELEMENT
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4002, 4003"></context>
+ <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Comment_Shape, Comment_Shape_CN, Constraint_Shape, Constraint_Shape_CN"></context>
+
+ <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge"></context>
<!-- Additional descriptors provided in case the semantic hint is is not provided -->
@@ -512,42 +502,24 @@
<editpartProvider class="org.eclipse.papyrus.sysml.diagram.parametric.provider.InheritedCompositeDiagramEditPartProvider">
<Priority name="Low"></Priority>
- <!--
- The semantic hints given here are used in case the provider is not already loaded.
- As soon as the provider is loaded its provides method is used.
- "2109" = COMMENT
- "5192" = COMMENT_LABEL_BODY_HINT
- "3097" = COMMENT_CN
- "5150" = COMMENT_CN_LABEL_BODY_HINT
- "2114" = CONSTRAINT
- "5197" = CONSTRAINT_LABEL_NAME_HINT
- "6039" = CONSTRAINT_LABEL_SPECIFICATION_HINT
- "3120" = CONSTRAINT_CN
- "6048" = CONSTRAINT_CN_LABEL_NAME_HINT
- "6049" = CONSTRAINT_CN_LABEL_SPECIFICATION_HINT
- -->
<object id="COMMENT" class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2109, 5192"></method>
+ <method name="getType()" value="Comment_Shape, Comment_BodyLabel"></method>
</object>
<object id="COMMENT_CN" class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3097, 5150"></method>
+ <method name="getType()" value="Comment_Shape_CN, Comment_BodyLabel_CN"></method>
</object>
<object id="CONSTRAINT" class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2114, 5197, 6039"></method>
+ <method name="getType()" value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"></method>
</object>
<object id="CONSTRAINT_CN" class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3120, 6048, 6049"></method>
+ <method name="getType()" value="Constraint_Shape_CN, Constraint_NameLabel_CN, Constraint_BodyLabel_CN"></method>
</object>
- <!--
- "4002" = COMMENT_ANNOTATED_ELEMENT
- "4003" = CONSTRAINT_CONSTRAINED_ELEMENT
- -->
<object id="COMMENT_ANNOTATED_ELEMENT" class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4002"></method>
+ <method name="getType()" value="Comment_AnnotatedElementEdge"></method>
</object>
<object id="CONSTRAINT_CONSTRAINED_ELEMENT" class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4003"></method>
+ <method name="getType()" value="Constraint_ConstrainedElementEdge"></method>
</object>
<context views="COMMENT, COMMENT_CN, CONSTRAINT, CONSTRAINT_CN"></context>
@@ -628,20 +600,20 @@
<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.uml.diagram.parametric.ContextLink"
- name="ContextLink"
+ id="org.eclipse.papyrus.sysml.diagram.parametric.Constraint_ContextEdge"
+ name="Constraint Context Edge"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
<specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
- <param name="semanticHint" value="8500"/>
+ <param name="semanticHint" value="Constraint_ContextEdge"/>
</specializationType>
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.uml.diagram.parametric.ContextLinkAppliedStereotype"
- name="ContextLinkAppliedStereotype"
+ id="org.eclipse.papyrus.sysml.diagram.parametric.Constraint_KeywordLabel"
+ name="Constraint Keyword Label"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
<specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
- <param name="semanticHint" value="8501"/>
+ <param name="semanticHint" value="Constraint_KeywordLabel"/>
</specializationType>
</metamodel>
</extension>
@@ -713,4 +685,32 @@
diagramType="Parametric">
</visualTypeProvider>
</extension>
+
+<extension
+ point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
+ <diagramReconciler
+ diagramType="Parametric"
+ reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler"
+ source="undefined"
+ target="1.1.0">
+ </diagramReconciler>
+ <diagramReconciler
+ diagramType="Parametric"
+ reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconcilerForCompartment"
+ source="undefined"
+ target="1.2.0">
+ </diagramReconciler>
+ <diagramReconciler
+ diagramType="Parametric"
+ reconcilerClass="org.eclipse.papyrus.sysml.diagram.parametric.migration.ParametricReconciler_1_2_0"
+ source="undefined"
+ target="1.1.0">
+ </diagramReconciler>
+ <diagramReconciler
+ diagramType="Parametric"
+ reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler_1_2_0"
+ source="undefined"
+ target="1.2.0">
+ </diagramReconciler>
+</extension>
</plugin>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ElementTypes.java
index 30019c4d429..827030013c4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ElementTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ElementTypes.java
@@ -7,7 +7,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Régis CHEVREL: chevrel.regis <at> gmail.com
+ * R�gis CHEVREL: chevrel.regis <at> gmail.com
* CEA LIST - Initial API and implementation
*
*****************************************************************************/
@@ -15,6 +15,13 @@ package org.eclipse.papyrus.sysml.diagram.parametric.provider;
import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
public class ElementTypes extends AbstractElementTypeEnumerator {
@@ -23,7 +30,7 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
/** ********************************************************* */
/** SysML Parametric Diagram :: Diagram */
- public static final String DIAGRAM_ID = "Parametric"; //$NON-NLS-1$
+ public static final String DIAGRAM_ID = "Parametric";
@@ -33,36 +40,36 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
/** ********************************************************* */
/** CompositeDiagram :: CONSTRAINT */
- public static final IHintedType CONSTRAINT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"); //$NON-NLS-1$
+ public static final IHintedType CONSTRAINT = (IHintedType) UMLElementTypes.Constraint_Shape;
- public static final String CONSTRAINT_LABEL_NAME_HINT = "5197"; //$NON-NLS-1$
+ public static final String CONSTRAINT_LABEL_NAME_HINT = ConstraintNameEditPart.VISUAL_ID;
- public static final String CONSTRAINT_LABEL_SPECIFICATION_HINT = "6039"; //$NON-NLS-1$
+ public static final String CONSTRAINT_LABEL_SPECIFICATION_HINT = ConstraintSpecificationEditPart.VISUAL_ID;
/** CompositeDiagram :: COMMENT_CN */
- public static final IHintedType COMMENT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_3097"); //$NON-NLS-1$
+ public static final IHintedType COMMENT_CN = (IHintedType) UMLElementTypes.Comment_Shape_CN;
- public static final String COMMENT_CN_LABEL_BODY_HINT = "5150"; //$NON-NLS-1$
+ public static final String COMMENT_CN_LABEL_BODY_HINT = CommentBodyEditPartCN.VISUAL_ID;
/** CompositeDiagram :: COMMENT */
- public static final IHintedType COMMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_2109"); //$NON-NLS-1$
+ public static final IHintedType COMMENT = (IHintedType) UMLElementTypes.Comment_Shape;
- public static final String COMMENT_LABEL_BODY_HINT = "5192"; //$NON-NLS-1$
+ public static final String COMMENT_LABEL_BODY_HINT = CommentBodyEditPart.VISUAL_ID;
/** CompositeDiagram :: CONSTRAINT_CN */
- public static final IHintedType CONSTRAINT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"); //$NON-NLS-1$
+ public static final IHintedType CONSTRAINT_CN = (IHintedType) UMLElementTypes.Constraint_Shape_CN;
- public static final String CONSTRAINT_CN_LABEL_NAME_HINT = "6048"; //$NON-NLS-1$
+ public static final String CONSTRAINT_CN_LABEL_NAME_HINT = ConstraintNameEditPartCN.VISUAL_ID;
- public static final String CONSTRAINT_CN_LABEL_SPECIFICATION_HINT = "6049"; //$NON-NLS-1$
+ public static final String CONSTRAINT_CN_LABEL_SPECIFICATION_HINT = ConstraintSpecificationEditPartCN.VISUAL_ID;
/** CompositeDiagram :: COMMENT_ANNOTATED_ELEMENT */
- public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"); //$NON-NLS-1$
+ public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) UMLElementTypes.Comment_AnnotatedElementEdge;
/** CompositeDiagram :: CONTEXT_LINK */
- public static final IHintedType CONTEXT_LINK = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.parametric.ContextLink"); //$NON-NLS-1$
+ public static final IHintedType CONTEXT_LINK = (IHintedType) getElementType("org.eclipse.papyrus.sysml.diagram.parametric.Constraint_ContextEdge"); //$NON-NLS-1$
/** CompositeDiagram :: CONContextLinkAppliedStereotype */
- public static final IHintedType CONTEXT_LINK_APPLIED_STEREOTYPE = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.parametric.ContextLinkAppliedStereotype"); //$NON-NLS-1$
+ public static final IHintedType CONTEXT_LINK_APPLIED_STEREOTYPE = (IHintedType) getElementType("org.eclipse.papyrus.sysml.diagram.parametric.Constraint_KeywordLabel"); //$NON-NLS-1$
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramViewProvider.java
index 668674b5790..3098ae11653 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramViewProvider.java
@@ -7,7 +7,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Régis CHEVREL: chevrel.regis <at> gmail.com
+ * R�gis CHEVREL: chevrel.regis <at> gmail.com
* CEA LIST - Initial API and implementation
*
*****************************************************************************/
@@ -46,7 +46,7 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
if (elementType != null) {
if (elementType == ElementTypes.CONTEXT_LINK) {
org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider classDiagramUMLProvider = new org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider();
- createdEdge = classDiagramUMLProvider.createConstraintContext_8500(containerView, index, persisted, preferencesHint);
+ createdEdge = classDiagramUMLProvider.createConstraint_ContextEdge(containerView, index, persisted, preferencesHint);
}
else {
createdEdge = super.createEdge(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
@@ -214,37 +214,4 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
}
}
- // /**
- // * @generated
- // */
- // @SuppressWarnings("unchecked")
- // public Edge createContextLink_8500(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
- // Connector edge = NotationFactory.eINSTANCE.createConnector();
- // edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
- // RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
- // ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);
- // points.add(new RelativeBendpoint());
- // points.add(new RelativeBendpoint());
- // bendpoints.setPoints(points);
- // edge.setBendpoints(bendpoints);
- // ViewUtil.insertChildView(containerView, edge, index, persisted);
- // edge.setType(UMLVisualIDRegistry.getType(ContextLinkEditPart.VISUAL_ID));
- // edge.setElement(null);
- // // initializePreferences
- // final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
- // PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge, prefStore, "Undefined");
- // PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Undefined");
- // //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));
- // //if (routing != null) {
- // // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);
- // //}
- // PreferenceInitializerForElementHelper.initRountingFromPrefs(edge, prefStore, "Undefined");
- // Node label8501 = createLabel(edge, UMLVisualIDRegistry.getType(ContextLinkAppliedStereotypeEditPart.VISUAL_ID));
- // label8501.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
- // Location location8501 = (Location)label8501.getLayoutConstraint();
- // location8501.setX(0);
- // location8501.setY(15);
- // return edge;
- // }
-
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/migration/ParametricReconciler_1_2_0.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/migration/ParametricReconciler_1_2_0.java
new file mode 100644
index 00000000000..bcfbb443efe
--- /dev/null
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/migration/ParametricReconciler_1_2_0.java
@@ -0,0 +1,96 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Florian Noyrit (CEA) florian.noyrit@cea.fr - Initial API and Implementation
+ * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - reconciler to add floating label
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.parametric.migration;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
+
+/**
+ * Parametric Diagram Reconciler from 1.1.0 to 1.2.0
+ */
+public class ParametricReconciler_1_2_0 extends DiagramReconciler {
+
+ @Override
+ public ICommand getReconcileCommand(Diagram diagram) {
+ CompositeCommand cc = new CompositeCommand("Migrate diagram from 1.1.0 to 1.2.0");
+ cc.add(new ChangeVisualIDsCommand(diagram));
+ return cc;
+ }
+
+ protected class ChangeVisualIDsCommand extends AbstractCommand {
+
+ protected final Diagram diagram;
+
+ public ChangeVisualIDsCommand(Diagram diagram) {
+ super("Change the diagram's visual ids from 1.1.0 to 1.2.0");
+ this.diagram = diagram;
+ }
+
+ @Override
+ protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+ TreeIterator<EObject> allContentIterator = diagram.eAllContents();
+
+ while (allContentIterator.hasNext()) {
+ EObject eObject = allContentIterator.next();
+ if (eObject instanceof View) {
+ View view = (View) eObject;
+ view.setType(getNewVisualID(view.getType()));
+ }
+ }
+
+ return CommandResult.newOKCommandResult();
+ }
+
+ @Override
+ public boolean canUndo() {
+ return false;
+ }
+
+ @Override
+ public boolean canRedo() {
+ return false;
+ }
+
+ @Override
+ protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+ throw new ExecutionException("Should not be called, canRedo false");
+ }
+
+ @Override
+ protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+ throw new ExecutionException("Should not be called, canUndo false");
+ }
+ }
+
+ public static String getNewVisualID(String oldVisualID) {
+ switch (oldVisualID) {
+ case "8500":
+ return "Constraint_ContextEdge";
+ case "8501":
+ return "Constraint_KeywordLabel";
+ default:
+ return oldVisualID;
+ }
+ }
+}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.gen.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.gen.xml
index 95ee1f0deba..b5ef119871e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.gen.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.gen.xml
@@ -109,51 +109,18 @@
<viewProvider class="org.eclipse.papyrus.sysml.diagram.requirement.provider.InheritedClassDiagramViewProvider">
<Priority name="Low"/>
- <!--
- "2007" = PACKAGE
- "3009" = PACKAGE_CN
- "2008" = CLASS
- "3010" = CLASS_CN
- "2097" = DEFAULT_NAMED_ELEMENT
- "3032" = CONTAINMENT_CIRCLE_CN
- "2012" = COMMENT
- "3028" = COMMENT_CN
- "2011" = CONSTRAINT
- "3029" = CONSTRAINT_CN
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2007, 3009, 2008, 3010, 2097, 3032, 2012, 3028, 2011, 3029"/>
+ <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Package_Shape, Package_Shape_CN, Class_Shape, Class_Shape_CN, NamedElement_Shape, Comment_Shape, Comment_Shape_CN, Constraint_Shape, Constraint_Shape_CN"/>
- <!--
- "3012" = CLASS_PROPERTY_CLN
- "3011" = CLASS_RECEPTION_CLN
- "3013" = CLASS_OPERATION_CLN
- "3014" = CLASS_CLASS_CLN
- "3036" = CLASS_INTERFACE_CLN
- "3052" = CLASS_ENUMERATION_CLN
- "3047" = CLASS_PRIMITIVE_TYPE_CLN
- "3044" = CLASS_DATA_TYPE_CLN
- "3050" = CLASS_SIGNAL_CLN
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3012, 3011, 3013, 3014, 3036, 3052, 3047, 3044, 3050"/>
+ <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Property_ClassAttributeLabel, Reception_ReceptionLabel, Operation_ClassOperationLabel, Class_ClassNestedClassifierLabel, Interface_ClassNestedClassifierLabel, Enumeration_ClassNestedClassifierLabel, PrimitiveType_ClassNestedClassifierLabel, DataType_ClassNestedClassifierLabel, Signal_ClassNestedClassifierLabel"/>
- <!--
- "4006" = ABSTRACTION
- "4023" = CONTAINMENT_LINK
- "4022" = CONTAINMENT_SUB_LINK
- "4008" = DEPENDENCY
- "4013" = COMMENT_ANNOTATED_ELEMENT
- "4014" = CONSTRAINT_CONSTRAINED_ELEMENT
- "4005" = REALIZATION
- "4010" = PACKAGE_IMPORT
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4006, 4023, 4022, 4008, 4013, 4014, 4005, 4010"/>
+ <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Abstraction_Edge, Element_ContainmentEdge, Dependency_Edge, Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge, Realization_Edge, PackageImport_Edge"/>
<object id="elementtype.node"
class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
<method
name="getSemanticHint()"
- value="2007, 3009, 2008, 3010, 2097, 3032, 2012, 3028, 2011, 3029">
+ value="Package_Shape, Package_Shape_CN, Class_Shape, Class_Shape_CN, NamedElement_Shape, Comment_Shape, Comment_Shape_CN, Constraint_Shape, Constraint_Shape_CN">
</method>
</object>
<context viewClass="org.eclipse.gmf.runtime.notation.Node" elements="elementtype.node"/>
@@ -163,7 +130,7 @@
<method
name="getSemanticHint()"
- value="4006, 4023, 4022, 4008, 4013, 4014, 4005, 4010">
+ value="Abstraction_Edge, Element_ContainmentEdge, Dependency_Edge, Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge, Realization_Edge, PackageImport_Edge">
</method>
</object>
<context viewClass="org.eclipse.gmf.runtime.notation.Edge" elements="elementtype.edge"/>
@@ -284,208 +251,137 @@
<!-- EditPartProvider for inherited elements (from ClassDiagram) -->
<editpartProvider class="org.eclipse.papyrus.sysml.diagram.requirement.provider.InheritedClassDiagramEditPartProvider">
<Priority name="Low"/>
- <!--
- The semantic hints given here are used in case the provider is not already loaded.
- As soon as the provider is loaded its provides method is used.
- "2007" = PACKAGE
- "5026" = PACKAGE_LABEL_NAME_HINT
- "7016" = PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
- "3009" = PACKAGE_CN
- "5017" = PACKAGE_CN_LABEL_NAME_HINT
- "7010" = PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
- "2008" = CLASS
- "5029" = CLASS_LABEL_NAME_HINT
- "7017" = CLASS_COMPARTMENT_ATTRIBUTE_HINT
- "7018" = CLASS_COMPARTMENT_OPERATION_HINT
- "7019" = CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT
- "3010" = CLASS_CN
- "5014" = CLASS_CN_LABEL_NAME_HINT
- "7011" = CLASS_CN_COMPARTMENT_ATTRIBUTE_HINT
- "7012" = CLASS_CN_COMPARTMENT_OPERATION_HINT
- "7013" = CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT
- "2097" = DEFAULT_NAMED_ELEMENT
- "5157" = DEFAULT_NAMED_ELEMENT_LABEL_NAME_HINT
- "3032" = CONTAINMENT_CIRCLE_CN
- "2012" = COMMENT
- "5038" = COMMENT_LABEL_BODY_HINT
- "3028" = COMMENT_CN
- "5063" = COMMENT_CN_LABEL_BODY_HINT
- "2011" = CONSTRAINT
- "5037" = CONSTRAINT_LABEL_NAME_HINT
- "5159" = CONSTRAINT_LABEL_BODY_HINT
- "3029" = CONSTRAINT_CN
- "5064" = CONSTRAINT_CN_LABEL_NAME_HINT
- "5160" = CONSTRAINT_CN_LABEL_BODY_HINT
- -->
<object
id="PACKAGE"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2007, 5026, 7016"/>
+ <method name="getType()" value="Package_Shape, Package_NameLabel, Package_PackagedElementCompartment"/>
</object>
<object
id="PACKAGE_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3009, 5017, 7010"/>
+ <method name="getType()" value="Package_Shape_CN, Package_NameLabel_CN, Package_PackagedElementCompartment_CN"/>
</object>
<object
id="CLASS"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2008, 5029, 7017, 7018, 7019"/>
+ <method name="getType()" value="Class_Shape, Class_NameLabel, Class_AttributeCompartment, Class_OperationCompartment, Class_NestedClassifierCompartment"/>
</object>
<object
id="CLASS_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3010, 5014, 7011, 7012, 7013"/>
+ <method name="getType()" value="Class_Shape_CN, Class_NameLabel_CN, Class_AttributeCompartment_CN, Class_OperationCompartment_CN, Class_NestedClassifierCompartment_CN"/>
</object>
<object
id="DEFAULT_NAMED_ELEMENT"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2097, 5157"/>
- </object>
- <object
- id="CONTAINMENT_CIRCLE_CN"
- class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3032"/>
+ <method name="getType()" value="NamedElement_Shape, NamedElement_NameLabel"/>
</object>
<object
id="COMMENT"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2012, 5038"/>
+ <method name="getType()" value="Comment_Shape, Comment_BodyLabel"/>
</object>
<object
id="COMMENT_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3028, 5063"/>
+ <method name="getType()" value="Comment_Shape_CN, Comment_BodyLabel_CN"/>
</object>
<object
id="CONSTRAINT"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2011, 5037, 5159"/>
+ <method name="getType()" value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"/>
</object>
<object
id="CONSTRAINT_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3029, 5064, 5160"/>
+ <method name="getType()" value="Constraint_Shape_CN, Constraint_NameLabel_CN, Constraint_FloatingNameLabel_CN"/>
</object>
- <!--
- "3012" = CLASS_PROPERTY_CLN
- "3011" = CLASS_RECEPTION_CLN
- "3013" = CLASS_OPERATION_CLN
- "3014" = CLASS_CLASS_CLN
- "3036" = CLASS_INTERFACE_CLN
- "3052" = CLASS_ENUMERATION_CLN
- "3047" = CLASS_PRIMITIVE_TYPE_CLN
- "3044" = CLASS_DATA_TYPE_CLN
- "3050" = CLASS_SIGNAL_CLN
- -->
<object
id="CLASS_PROPERTY_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3012"/>
+ <method name="getType()" value="Property_ClassAttributeLabel"/>
</object>
<object
id="CLASS_RECEPTION_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3011"/>
+ <method name="getType()" value="Reception_ReceptionLabel"/>
</object>
<object
id="CLASS_OPERATION_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3013"/>
+ <method name="getType()" value="Operation_ClassOperationLabel"/>
</object>
<object
id="CLASS_CLASS_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3014"/>
+ <method name="getType()" value="Class_ClassNestedClassifierLabel"/>
</object>
<object
id="CLASS_INTERFACE_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3036"/>
+ <method name="getType()" value="Interface_ClassNestedClassifierLabel"/>
</object>
<object
id="CLASS_ENUMERATION_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3052"/>
+ <method name="getType()" value="Enumeration_ClassNestedClassifierLabel"/>
</object>
<object
id="CLASS_PRIMITIVE_TYPE_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3047"/>
+ <method name="getType()" value="PrimitiveType_ClassNestedClassifierLabel"/>
</object>
<object
id="CLASS_DATA_TYPE_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3044"/>
+ <method name="getType()" value="DataType_ClassNestedClassifierLabel"/>
</object>
<object
id="CLASS_SIGNAL_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3050"/>
+ <method name="getType()" value="Signal_ClassNestedClassifierLabel"/>
</object>
- <!--
- "4006" = ABSTRACTION
- "6014" = ABSTRACTION_LABEL_NAME_HINT
- "6015" = ABSTRACTION_LABEL_APPLIED_STEREOTYPE_HINT
- "4023" = CONTAINMENT_LINK
- "4022" = CONTAINMENT_SUB_LINK
- "4008" = DEPENDENCY
- "6026" = DEPENDENCY_LABEL_NAME_HINT
- "6027" = DEPENDENCY_LABEL_APPLIED_STEREOTYPE_HINT
- "4013" = COMMENT_ANNOTATED_ELEMENT
- "4014" = CONSTRAINT_CONSTRAINED_ELEMENT
- "4005" = REALIZATION
- "6012" = REALIZATION_LABEL_APPLIED_STEREOTYPE_HINT
- "6013" = REALIZATION_LABEL_NAME_HINT
- "4010" = PACKAGE_IMPORT
- "6022" = PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT
- -->
<object
id="ABSTRACTION"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4006, 6014, 6015"/>
+ <method name="getType()" value="Abstraction_Edge, Abstraction_NameLabel, Abstraction_StereotypeLabel"/>
</object>
<object
id="CONTAINMENT_LINK"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4023"/>
- </object>
- <object
- id="CONTAINMENT_SUB_LINK"
- class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4022"/>
+ <method name="getType()" value="Element_ContainmentEdge"/>
</object>
<object
id="DEPENDENCY"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4008, 6026, 6027"/>
+ <method name="getType()" value="Dependency_Edge, Dependency_NameLabel, Dependency_StereotypeLabel"/>
</object>
<object
id="COMMENT_ANNOTATED_ELEMENT"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4013"/>
+ <method name="getType()" value="Comment_AnnotatedElementEdge"/>
</object>
<object
id="CONSTRAINT_CONSTRAINED_ELEMENT"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4014"/>
+ <method name="getType()" value="Constraint_ConstrainedElementEdge"/>
</object>
<object
id="REALIZATION"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4005, 6012, 6013"/>
+ <method name="getType()" value="Realization_Edge, Realization_StereotypeLabel, Realization_NameLabel"/>
</object>
<object
id="PACKAGE_IMPORT"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4010, 6022"/>
+ <method name="getType()" value="PackageImport_Edge, PackageImport_StereotypeLabel"/>
</object>
- <context views="PACKAGE, PACKAGE_CN, CLASS, CLASS_CN, NAMED_ELEMENT, CONTAINMENT_CIRCLE_CN, COMMENT, COMMENT_CN, CONSTRAINT, CONSTRAINT_CN"/>
+ <context views="PACKAGE, PACKAGE_CN, CLASS, CLASS_CN, NAMED_ELEMENT, COMMENT, COMMENT_CN, CONSTRAINT, CONSTRAINT_CN"/>
<context views="CLASS_PROPERTY_CLN, CLASS_RECEPTION_CLN, CLASS_OPERATION_CLN, CLASS_CLASS_CLN, CLASS_INTERFACE_CLN, CLASS_ENUMERATION_CLN, CLASS_PRIMITIVE_TYPE_CLN, CLASS_DATA_TYPE_CLN, CLASS_SIGNAL_CLN"/>
- <context views="ABSTRACTION, CONTAINMENT_LINK, CONTAINMENT_SUB_LINK, DEPENDENCY, COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT, REALIZATION, PACKAGE_IMPORT"/>
+ <context views="ABSTRACTION, CONTAINMENT_LINK, DEPENDENCY, COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT, REALIZATION, PACKAGE_IMPORT"/>
</editpartProvider>
</extension>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml
index 34e27161680..46e7572ae39 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml
@@ -80,59 +80,26 @@
<viewProvider class="org.eclipse.papyrus.sysml.diagram.requirement.provider.CustomInheritedElementViewProvider">
<Priority name="Low"/>
- <!--
- "2007" = PACKAGE
- "3009" = PACKAGE_CN
- "2008" = CLASS
- "3010" = CLASS_CN
- "2097" = DEFAULT_NAMED_ELEMENT
- "3032" = CONTAINMENT_CIRCLE_CN
- "2012" = COMMENT
- "3028" = COMMENT_CN
- "2011" = CONSTRAINT
- "3029" = CONSTRAINT_CN
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2007, 3009, 2008, 3010, 2097, 3032, 2012, 3028, 2011, 3029"/>
+ <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Package_Shape, Package_Shape_CN, Class_Shape, Class_Shape_CN, NamedElement_Shape, Comment_Shape, Comment_Shape_CN, Constraint_Shape, Constraint_Shape_CN"/>
- <!--
- "3012" = CLASS_PROPERTY_CLN
- "3011" = CLASS_RECEPTION_CLN
- "3013" = CLASS_OPERATION_CLN
- "3014" = CLASS_CLASS_CLN
- "3036" = CLASS_INTERFACE_CLN
- "3052" = CLASS_ENUMERATION_CLN
- "3047" = CLASS_PRIMITIVE_TYPE_CLN
- "3044" = CLASS_DATA_TYPE_CLN
- "3050" = CLASS_SIGNAL_CLN
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3012, 3011, 3013, 3014, 3036, 3052, 3047, 3044, 3050"/>
+ <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Property_ClassAttributeLabel, Reception_ReceptionLabel, Operation_ClassOperationLabel, Class_ClassNestedClassifierLabel, Interface_ClassNestedClassifierLabel, Enumeration_ClassNestedClassifierLabel, PrimitiveType_ClassNestedClassifierLabel, DataType_ClassNestedClassifierLabel, Signal_ClassNestedClassifierLabel"/>
- <!--
- "4006" = ABSTRACTION
- "4023" = CONTAINMENT_LINK
- "4022" = CONTAINMENT_SUB_LINK
- "4008" = DEPENDENCY
- "4013" = COMMENT_ANNOTATED_ELEMENT
- "4014" = CONSTRAINT_CONSTRAINED_ELEMENT
- -->
- <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4006, 4023, 4022, 4008, 4013, 4014"/>
+ <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Abstraction_Edge, Element_ContainmentEdge, Dependency_Edge, Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge"/>
<object id="elementtype.node"
class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
-
<method
name="getSemanticHint()"
- value="2007, 3009, 2008, 3010, 2097, 3032, 2012, 3028, 2011, 3029">
+ value="Package_Shape, Package_Shape_CN, Class_Shape, Class_Shape_CN, NamedElement_Shape, Comment_Shape, Comment_Shape_CN, Constraint_Shape, Constraint_Shape_CN">
</method>
</object>
<context viewClass="org.eclipse.gmf.runtime.notation.Node" elements="elementtype.node"/>
<object id="elementtype.edge"
class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
-
<method
name="getSemanticHint()"
- value="4006, 4023, 4022, 4008, 4013, 4014">
+ value="Abstraction_Edge, Element_ContainmentEdge, Dependency_Edge, Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge">
</method>
</object>
<context viewClass="org.eclipse.gmf.runtime.notation.Edge" elements="elementtype.edge"/>
@@ -243,193 +210,127 @@
<!-- EditPartProvider for inherited elements (from ClassDiagram) -->
<editpartProvider class="org.eclipse.papyrus.sysml.diagram.requirement.provider.InheritedClassDiagramEditPartProvider">
<Priority name="Low"/>
- <!--
- The semantic hints given here are used in case the provider is not already loaded.
- As soon as the provider is loaded its provides method is used.
- "2007" = PACKAGE
- "5026" = PACKAGE_LABEL_NAME_HINT
- "7016" = PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
- "3009" = PACKAGE_CN
- "5017" = PACKAGE_CN_LABEL_NAME_HINT
- "7010" = PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
- "2008" = CLASS
- "5029" = CLASS_LABEL_NAME_HINT
- "7017" = CLASS_COMPARTMENT_ATTRIBUTE_HINT
- "7018" = CLASS_COMPARTMENT_OPERATION_HINT
- "7019" = CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT
- "3010" = CLASS_CN
- "5014" = CLASS_CN_LABEL_NAME_HINT
- "7011" = CLASS_CN_COMPARTMENT_ATTRIBUTE_HINT
- "7012" = CLASS_CN_COMPARTMENT_OPERATION_HINT
- "7013" = CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT
- "2097" = DEFAULT_NAMED_ELEMENT
- "5157" = DEFAULT_NAMED_ELEMENT_LABEL_NAME_HINT
- "3032" = CONTAINMENT_CIRCLE_CN
- "2012" = COMMENT
- "5038" = COMMENT_LABEL_BODY_HINT
- "3028" = COMMENT_CN
- "5063" = COMMENT_CN_LABEL_BODY_HINT
- "2011" = CONSTRAINT
- "5037" = CONSTRAINT_LABEL_NAME_HINT
- "5159" = CONSTRAINT_LABEL_BODY_HINT
- "3029" = CONSTRAINT_CN
- "5064" = CONSTRAINT_CN_LABEL_NAME_HINT
- "5160" = CONSTRAINT_CN_LABEL_BODY_HINT
- -->
<object
id="PACKAGE"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2007, 5026, 7016"/>
+ <method name="getType()" value="Package_Shape, Package_NameLabel, Package_PackagedElementCompartment"/>
</object>
<object
id="PACKAGE_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3009, 5017, 7010"/>
+ <method name="getType()" value="Package_Shape_CN, Package_NameLabel_CN, Package_PackagedElementCompartment_CN"/>
</object>
<object
id="CLASS"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2008, 5029, 7017, 7018, 7019"/>
+ <method name="getType()" value="Class_Shape, Class_NameLabel, Class_AttributeCompartment, Class_OperationCompartment, Class_NestedClassifierCompartment"/>
</object>
<object
id="CLASS_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3010, 5014, 7011, 7012, 7013"/>
+ <method name="getType()" value="Class_Shape_CN, Class_NameLabel_CN, Class_AttributeCompartment_CN, Class_OperationCompartment_CN, Class_NestedClassifierCompartment_CN"/>
</object>
<object
id="DEFAULT_NAMED_ELEMENT"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2097, 5157"/>
- </object>
- <object
- id="CONTAINMENT_CIRCLE_CN"
- class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3032"/>
+ <method name="getType()" value="NamedElement_Shape, NamedElement_NameLabel"/>
</object>
<object
id="COMMENT"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2012, 5038"/>
+ <method name="getType()" value="Comment_Shape, Comment_BodyLabel"/>
</object>
<object
id="COMMENT_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3028, 5063"/>
+ <method name="getType()" value="Comment_Shape_CN, Comment_BodyLabel_CN"/>
</object>
<object
id="CONSTRAINT"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="2011, 5037, 5159"/>
+ <method name="getType()" value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"/>
</object>
<object
id="CONSTRAINT_CN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3029, 5064, 5160"/>
+ <method name="getType()" value="Constraint_Shape_CN, Constraint_NameLabel_CN, Constraint_FloatingNameLabel_CN"/>
</object>
- <!--
- "3012" = CLASS_PROPERTY_CLN
- "3011" = CLASS_RECEPTION_CLN
- "3013" = CLASS_OPERATION_CLN
- "3014" = CLASS_CLASS_CLN
- "3036" = CLASS_INTERFACE_CLN
- "3052" = CLASS_ENUMERATION_CLN
- "3047" = CLASS_PRIMITIVE_TYPE_CLN
- "3044" = CLASS_DATA_TYPE_CLN
- "3050" = CLASS_SIGNAL_CLN
- -->
<object
id="CLASS_PROPERTY_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3012"/>
+ <method name="getType()" value="Property_ClassAttributeLabel"/>
</object>
<object
id="CLASS_RECEPTION_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3011"/>
+ <method name="getType()" value="Reception_ReceptionLabel"/>
</object>
<object
id="CLASS_OPERATION_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3013"/>
+ <method name="getType()" value="Operation_ClassOperationLabel"/>
</object>
<object
id="CLASS_CLASS_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3014"/>
+ <method name="getType()" value="Class_ClassNestedClassifierLabel"/>
</object>
<object
id="CLASS_INTERFACE_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3036"/>
+ <method name="getType()" value="Interface_ClassNestedClassifierLabel"/>
</object>
<object
id="CLASS_ENUMERATION_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3052"/>
+ <method name="getType()" value="Enumeration_ClassNestedClassifierLabel"/>
</object>
<object
id="CLASS_PRIMITIVE_TYPE_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3047"/>
+ <method name="getType()" value="PrimitiveType_ClassNestedClassifierLabel"/>
</object>
<object
id="CLASS_DATA_TYPE_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3044"/>
+ <method name="getType()" value="DataType_ClassNestedClassifierLabel"/>
</object>
<object
id="CLASS_SIGNAL_CLN"
class="org.eclipse.gmf.runtime.notation.Node">
- <method name="getType()" value="3050"/>
+ <method name="getType()" value="Signal_ClassNestedClassifierLabel"/>
</object>
- <!--
- "4006" = ABSTRACTION
- "6014" = ABSTRACTION_LABEL_NAME_HINT
- "6015" = ABSTRACTION_LABEL_APPLIED_STEREOTYPE_HINT
- "4023" = CONTAINMENT_LINK
- "4022" = CONTAINMENT_SUB_LINK
- "4008" = DEPENDENCY
- "6026" = DEPENDENCY_LABEL_NAME_HINT
- "6027" = DEPENDENCY_LABEL_APPLIED_STEREOTYPE_HINT
- "4013" = COMMENT_ANNOTATED_ELEMENT
- "4014" = CONSTRAINT_CONSTRAINED_ELEMENT
- -->
<object
id="ABSTRACTION"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4006, 6014, 6015"/>
+ <method name="getType()" value="Abstraction_Edge, Abstraction_NameLabel, Abstraction_StereotypeLabel"/>
</object>
<object
id="CONTAINMENT_LINK"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4023"/>
- </object>
- <object
- id="CONTAINMENT_SUB_LINK"
- class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4022"/>
+ <method name="getType()" value="Element_ContainmentEdge"/>
</object>
<object
id="DEPENDENCY"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4008, 6026, 6027"/>
+ <method name="getType()" value="Dependency_Edge, Dependency_NameLabel, Dependency_StereotypeLabel"/>
</object>
<object
id="COMMENT_ANNOTATED_ELEMENT"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4013"/>
+ <method name="getType()" value="Comment_AnnotatedElementEdge"/>
</object>
<object
id="CONSTRAINT_CONSTRAINED_ELEMENT"
class="org.eclipse.gmf.runtime.notation.Edge">
- <method name="getType()" value="4014"/>
+ <method name="getType()" value="Constraint_ConstrainedElementEdge"/>
</object>
- <context views="PACKAGE, PACKAGE_CN, CLASS, CLASS_CN, DEFAULT_NAMED_ELEMENT, CONTAINMENT_CIRCLE_CN, COMMENT, COMMENT_CN, CONSTRAINT, CONSTRAINT_CN"/>
+ <context views="PACKAGE, PACKAGE_CN, CLASS, CLASS_CN, DEFAULT_NAMED_ELEMENT, COMMENT, COMMENT_CN, CONSTRAINT, CONSTRAINT_CN"/>
<context views="CLASS_PROPERTY_CLN, CLASS_RECEPTION_CLN, CLASS_OPERATION_CLN, CLASS_CLASS_CLN, CLASS_INTERFACE_CLN, CLASS_ENUMERATION_CLN, CLASS_PRIMITIVE_TYPE_CLN, CLASS_DATA_TYPE_CLN, CLASS_SIGNAL_CLN"/>
- <context views="ABSTRACTION, CONTAINMENT_LINK, CONTAINMENT_SUB_LINK, DEPENDENCY, COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT"/>
+ <context views="ABSTRACTION, CONTAINMENT_LINK, DEPENDENCY, COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT"/>
</editpartProvider>
</extension>
@@ -514,42 +415,27 @@
<object
class="org.eclipse.gmf.runtime.notation.Diagram"
id="generated-diagram">
- <method
- name="getType()"
- value="Requirement">
- </method>
+ <method name="getType()" value="Requirement"/>
</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,3002,3003,3004,3015,3031,3016,3005,3006,3007,3008,3020,3021,3022,3023,3024,3025,3017,3009,3010,3011,3012,3013,3014,3026,3027,3018,3019,3028,3029,3030">
- </method>
+ <method name="getType()" value="Dependency_Shape,AssociationClass_Shape,Association_Shape,InstanceSpecification_Shape,Component_Shape,Signal_Shape,Interface_Shape,Model_Shape,Enumeration_Shape,Package_Shape,InformationItem_Shape,Class_Shape,PrimitiveType_Shape,DataType_Shape,,Comment_Shape,Diagram_ShortcutShape,DurationObservation_Shape,TimeObservation_Shape,NamedElement_DefaultShape,Property_ClassAttributeLabel,Property_ComponentAttributeLabel,Property_SignalAttributeLabel,Property_InterfaceAttributeLabel,Property_PrimitiveTypeAttributeLabel,Property_DataTypeAttributeLabel,Class_ClassNestedClassifierLabel,Class_ComponentNestedClassifierLabel,Class_InterfaceNestedClassifierLabel,Operation_ClassOperationLabel,Operation_ComponentOperationLabel,Operation_InterfaceOperationLabel,Operation_PrimitiveTypeOperationLabel,Operation_DataTypeOperationLabel,ConnectableElementTemplateParameter_TemplateParameterLabel,OperationTemplateParameter_TemplateParameterLabel,ClassifierTemplateParameter_TemplateParameterLabel,TemplateParameter_TemplateParameterLabel,EnumerationLiteral_LiteralLabel,Reception_ReceptionLabel,Reception_InterfaceReceptionLabel,Slot_SlotLabel,RedefinableTemplateSignature_Shape,TemplateSignature_Shape,InstanceSpecification_Shape_CN,Component_Shape_CN,Signal_Shape_CN,Interface_Shape_CN,Model_Shape_CN,Enumeration_Shape_CN,Package_Shape_CN,InformationItem_Shape_CN,Class_Shape_CN,PrimitiveType_Shape_CN,DataType_Shape_CN,Comment_Shape_CN,_CN,Interface_ClassNestedClassifierLabel,Interface_ComponentNestedClassifierLabel,Interface_InterfaceNestedClassifierLabel,Enumeration_ClassNestedClassifierLabel,Enumeration_ComponentNestedClassifierLabel,Enumeration_InterfaceNestedClassifierLabel,PrimitiveType_ClassNestedClassifierLabel,PrimitiveType_ComponentNestedClassifierLabel,PrimitiveType_InterfaceNestedClassifierLabel,DataType_ClassNestedClassifierLabel,DataType_ComponentNestedClassifierLabel,DataType_InterfaceNestedClassifierLabel,Signal_ClassNestedClassifierLabel,Signal_ComponentNestedClassifierLabel,Signal_InterfaceNestedClassifierLabel,Component_ClassNestedClassifierLabel,Component_InterfaceNestedClassifierLabel,Component_ComponentNestedClassifierLabel"/>
</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">
- </method>
+ <method name="getType()" value="AssociationClass_TetherEdge,AssociationClass_Edge,Association_Edge,Association_BranchEdge,Generalization_Edge,InterfaceRealization_Edge,Substitution_Edge,Realization_Edge,Abstraction_Edge,Usage_Edge,Dependency_Edge,Dependency_BranchEdge,ElementImport_Edge,PackageImport_Edge,PackageMerge_Edge,ProfileApplication_Edge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,TemplateBinding_Edge,GeneralizationSet_Edge,InstanceSpecification_Edge,Element_ContainmentEdge,TimeObservation_EventEdge,DurationObservation_EventEdge,InformationFlow_Edge,Constraint_ContextEdge"/>
</object>
<object
class="org.eclipse.gmf.runtime.notation.Node"
id="generated-labels">
- <method
- name="getType()"
- value="5066,5002,5005,5008,5011,5020,5023,5026,5029,5032,5035,5037,5038,0,5040,5043,5046,5049,5052,5055,5017,5014,5058,5061,5063,5064">
- </method>
+ <method name="getType()" value="Dependency_MultiNameLabel,Dependency_FloatingNameLabel,AssociationClass_NameLabel,AssociationClass_FloatingNameLabel,Association_FloatingNameLabel,InstanceSpecification_NameLabel,InstanceSpecification_FloatingNameLabel,Component_NameLabel,Component_FloatingNameLabel,Signal_NameLabel,Signal_FloatingNameLabel,Interface_NameLabel,Interface_FloatingNameLabel,Model_NameLabel,Enumeration_NameLabel,Enumeration_FloatingNameLabel,Package_NameLabel,InformationItem_NameLabel,InformationItem_FloatingNameLabel,Class_NameLabel,Class_FloatingNameLabel,PrimitiveType_NameLabel,PrimitiveType_FloatingNameLabel,DataType_NameLabel,DataType_FloatingNameLabel,Constraint_NameLabel,Constraint_BodyLabel,Comment_BodyLabel,Diagram_NameLabel,DurationObservation_FloatingNameLabel,DurationObservation_StereotypeLabel,TimeObservation_FloatingNameLabel,TimeObservation_StereotypeLabel,NamedElement_NameLabel,InstanceSpecification_NameLabel_CN,InstanceSpecification_FloatingNameLabel_CN,Component_NameLabel_CN,Component_FloatingNameLabel_CN,Signal_NameLabel_CN,Signal_FloatingNameLabel_CN,Interface_NameLabel_CN,Interface_FloatingNameLabel_CN,Model_NameLabel_CN,Enumeration_NameLabel_CN,Enumeration_FloatingNameLabel_CN,Package_NameLabel_CN,InformationItem_NameLabel_CN,InformationItem_FloatingNameLabel_CN,Class_NameLabel_CN,Class_FloatingNameLabel_CN,PrimitiveType_NameLabel_CN,PrimitiveType_FloatingNameLabel_CN,DataType_NameLabel_CN,DataType_FloatingNameLabel_CN,Comment_BodyLabel_CN,Constraint_NameLabel_CN,Constraint_FloatingNameLabel_CN"/>
</object>
<object
class="org.eclipse.gmf.runtime.notation.Node"
id="generated-compartments">
- <method
- name="getType()"
- value="7034,7001,7002,7003,7004,7014,7005,7006,7007,7008,7009,7023,7024,7025,7026,7027,7028,7029,7030,7031,7010,7011,7012,7013,7032,7033,7015,7016,7017,7018,7019,7020,7021,7035">
- </method>
+ <method name="getType()" value="Class_AttributeCompartment_CN,Class_OperationCompartment_CN,Class_NestedClassifierCompartment_CN,Component_AttributeCompartment_CN,Component_OperationCompartment_CN,Component_NestedClassifierCompartment_CN,Signal_AttributeCompartment_CN,Interface_AttributeCompartment_CN,Interface_OperationCompartment_CN,Interface_NestedClassifierCompartment_CN,PrimitiveType_AttributeCompartment_CN,PrimitiveType_OperationCompartment_CN,DataType_AttributeCompartment_CN,DataType_OperationCompartment_CN,Model_PackagedElementCompartment_CN,Package_PackagedElementCompartment_CN,Enumeration_LiteralCompartment_CN,InstanceSpecification_SlotCompartment_CN,Class_AttributeCompartment,Class_OperationCompartment,Class_NestedClassifierCompartment,Component_AttributeCompartment,Component_OperationCompartment,Component_NestedClassifierCompartment,Interface_AttributeCompartment,Interface_OperationCompartment,Interface_NestedClassifierCompartment,PrimitiveType_AttributeCompartment,PrimitiveType_OperationCompartment,DataType_AttributeCompartment,DataType_OperationCompartment,AssociationClass_AttributeCompartment,InstanceSpecification_SlotCompartment,Signal_AttributeCompartment,Model_PackagedElementCompartment,Package_PackagedElementCompartment,Enumeration_LiteralCompartment,AssociationClass_OperationCompartment,AssociationClass_NestedClassifierCompartment,RedefinableTemplateSignature_TemplateParameterCompartment,TemplateSignature_TemplateParameterCompartment"/>
</object>
<object
id="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments">
@@ -558,353 +444,428 @@
</extension>
<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
<diagramMappings diagramID="RequirementDiagram">
-
- <mapping
- humanReadableType="attributes"
- type="7011">
- </mapping>
-
- <mapping
- humanReadableType="operations"
- type="7012">
- </mapping>
-
- <mapping
- humanReadableType="nested classifiers"
- type="7013">
- </mapping>
-
- <mapping
- humanReadableType="attributes"
- type="7023">
- </mapping>
-
- <mapping
- humanReadableType="operations"
- type="7024">
- </mapping>
-
- <mapping
- humanReadableType="nested classifiers"
- type="7025">
- </mapping>
-
- <mapping
- humanReadableType="attributes"
- type="7026">
- </mapping>
-
- <mapping
- humanReadableType="attributes"
- type="7027">
- </mapping>
-
- <mapping
- humanReadableType="operations"
- type="7028">
- </mapping>
-
- <mapping
- humanReadableType="nested classifiers"
- type="7029">
- </mapping>
-
- <mapping
- humanReadableType="attributes"
- type="7041">
- </mapping>
-
- <mapping
- humanReadableType="operations"
- type="7042">
- </mapping>
-
- <mapping
- humanReadableType="attributes"
- type="7032">
- </mapping>
-
- <mapping
- humanReadableType="operations"
- type="7033">
- </mapping>
-
- <mapping
- humanReadableType="packaged elements"
- type="7030">
- </mapping>
-
- <mapping
- humanReadableType="packaged elements"
- type="7010">
- </mapping>
-
- <mapping
- humanReadableType="literals"
- type="7031">
- </mapping>
-
- <mapping
- humanReadableType="slots"
- type="7035">
- </mapping>
-
- <mapping
- humanReadableType="attributes"
- type="7017">
- </mapping>
-
- <mapping
- humanReadableType="operations"
- type="7018">
- </mapping>
-
- <mapping
- humanReadableType="nested classifiers"
- type="7019">
- </mapping>
-
- <mapping
- humanReadableType="attributes"
- type="7002">
- </mapping>
-
- <mapping
- humanReadableType="operations"
- type="7003">
- </mapping>
-
- <mapping
- humanReadableType="nested classifiers"
- type="7004">
- </mapping>
-
- <mapping
- humanReadableType="attributes"
- type="7006">
- </mapping>
-
- <mapping
- humanReadableType="operations"
- type="7007">
- </mapping>
-
- <mapping
- humanReadableType="nested classifiers"
- type="7008">
- </mapping>
-
- <mapping
- humanReadableType="attributes"
- type="7039">
- </mapping>
-
- <mapping
- humanReadableType="operations"
- type="7040">
- </mapping>
-
- <mapping
- humanReadableType="attributes"
- type="7020">
- </mapping>
-
- <mapping
- humanReadableType="operations"
- type="7021">
- </mapping>
-
- <mapping
- humanReadableType="attributes"
- type="7034">
- </mapping>
-
- <mapping
- humanReadableType="slots"
- type="7001">
- </mapping>
-
- <mapping
- humanReadableType="attributes"
- type="7005">
- </mapping>
-
- <mapping
- humanReadableType="packaged elements"
- type="7009">
- </mapping>
-
- <mapping
- humanReadableType="packaged elements"
- type="7016">
- </mapping>
-
- <mapping
- humanReadableType="literals"
- type="7015">
- </mapping>
-
- <mapping
- humanReadableType="operations"
- type="7036">
- </mapping>
-
- <mapping
- humanReadableType="nested classifiers"
- type="7037">
- </mapping>
-
- <mapping
- humanReadableType="TemplateParameter"
- type="7014">
- </mapping>
-
- <mapping
- humanReadableType="TemplateParameter"
- type="7038">
- </mapping>
- <mapping
- humanReadableType="SourceRole"
- type="6031">
- </mapping>
- <mapping
- humanReadableType="TargetRole"
- type="6032">
- </mapping>
- <mapping
- humanReadableType="Stereotype"
- type="6001">
- </mapping>
- <mapping
- humanReadableType="Name"
- type="6002">
- </mapping>
- <mapping
- humanReadableType="TargetRole"
- type="6003">
- </mapping>
- <mapping
- humanReadableType="SourceRole"
- type="6005">
- </mapping>
- <mapping
- humanReadableType="SourceMultiplicity"
- type="6033">
- </mapping>
- <mapping
- humanReadableType="TargetMultiplicity"
- type="6034">
- </mapping>
- <mapping
- humanReadableType="TargetRole"
- type="6024">
- </mapping>
- <mapping
- humanReadableType="TargetMultiplicity"
- type="6035">
- </mapping>
- <mapping
- humanReadableType="Stereotype"
- type="6007">
- </mapping>
- <mapping
- humanReadableType="Stereotype"
- type="6008">
- </mapping>
- <mapping
- humanReadableType="Name"
- type="6009">
- </mapping>
- <mapping
- humanReadableType="Stereotype"
- type="6010">
- </mapping>
- <mapping
- humanReadableType="Name"
- type="6011">
- </mapping>
- <mapping
- humanReadableType="Stereotype"
- type="6012">
- </mapping>
- <mapping
- humanReadableType="Name"
- type="6013">
- </mapping>
- <mapping
- humanReadableType="Name"
- type="6014">
- </mapping>
- <mapping
- humanReadableType="Stereotype"
- type="6015">
- </mapping>
- <mapping
- humanReadableType="Name"
- type="6016">
- </mapping>
- <mapping
- humanReadableType="Stereotype"
- type="6017">
- </mapping>
- <mapping
- humanReadableType="Name"
- type="6026">
- </mapping>
- <mapping
- humanReadableType="Stereotype"
- type="6027">
- </mapping>
- <mapping
- humanReadableType="Alias"
- type="6020">
- </mapping>
- <mapping
- humanReadableType="Stereotype"
- type="6021">
- </mapping>
- <mapping
- humanReadableType="Stereotype"
- type="6022">
- </mapping>
- <mapping
- humanReadableType="Stereotype"
- type="6030">
- </mapping>
- <mapping
- humanReadableType="TemplateParameterSubstitution"
- type="6023">
- </mapping>
- <mapping
- humanReadableType="Stereotype"
- type="6036">
- </mapping>
- <mapping
- humanReadableType="Stereotype"
- type="6037">
- </mapping>
- <mapping
- humanReadableType="SourceRole"
- type="6039">
- </mapping>
- <mapping
- humanReadableType="TargetRole"
- type="6038">
- </mapping>
- <mapping
- humanReadableType="Stereotype"
- type="6041">
- </mapping>
+ <mapping
+ humanReadableType="attributes"
+ type="Class_AttributeCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="operations"
+ type="Class_OperationCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="nested classifiers"
+ type="Class_NestedClassifierCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="attributes"
+ type="Component_AttributeCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="operations"
+ type="Component_OperationCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="nested classifiers"
+ type="Component_NestedClassifierCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="attributes"
+ type="Signal_AttributeCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="attributes"
+ type="Interface_AttributeCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="operations"
+ type="Interface_OperationCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="nested classifiers"
+ type="Interface_NestedClassifierCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="attributes"
+ type="PrimitiveType_AttributeCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="operations"
+ type="PrimitiveType_OperationCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="attributes"
+ type="DataType_AttributeCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="operations"
+ type="DataType_OperationCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="packaged elements"
+ type="Model_PackagedElementCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="packaged elements"
+ type="Package_PackagedElementCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="literals"
+ type="Enumeration_LiteralCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="slots"
+ type="InstanceSpecification_SlotCompartment_CN">
+ </mapping>
+ <mapping
+ humanReadableType="attributes"
+ type="Class_AttributeCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="operations"
+ type="Class_OperationCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="nested classifiers"
+ type="Class_NestedClassifierCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="attributes"
+ type="Component_AttributeCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="operations"
+ type="Component_OperationCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="nested classifiers"
+ type="Component_NestedClassifierCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="attributes"
+ type="Interface_AttributeCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="operations"
+ type="Interface_OperationCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="nested classifiers"
+ type="Interface_NestedClassifierCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="attributes"
+ type="PrimitiveType_AttributeCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="operations"
+ type="PrimitiveType_OperationCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="attributes"
+ type="DataType_AttributeCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="operations"
+ type="DataType_OperationCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="attributes"
+ type="AssociationClass_AttributeCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="slots"
+ type="InstanceSpecification_SlotCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="attributes"
+ type="Signal_AttributeCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="packaged elements"
+ type="Model_PackagedElementCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="packaged elements"
+ type="Package_PackagedElementCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="literals"
+ type="Enumeration_LiteralCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="operations"
+ type="AssociationClass_OperationCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="nested classifiers"
+ type="AssociationClass_NestedClassifierCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="TemplateParameter"
+ type="RedefinableTemplateSignature_TemplateParameterCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="TemplateParameter"
+ type="TemplateSignature_TemplateParameterCompartment">
+ </mapping>
+ <mapping
+ humanReadableType="SourceRole"
+ type="AssociationClass_SourceRoleLabel">
+ </mapping>
+ <mapping
+ humanReadableType="TargetRole"
+ type="AssociationClass_TargetRoleLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="Association_StereotypeLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Name"
+ type="Association_NameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="TargetRole"
+ type="Association_TargetRoleLabel">
+ </mapping>
+ <mapping
+ humanReadableType="SourceRole"
+ type="Association_SourceRoleLabel">
+ </mapping>
+ <mapping
+ humanReadableType="SourceMultiplicity"
+ type="Association_SourceMultiplicityLabel">
+ </mapping>
+ <mapping
+ humanReadableType="TargetMultiplicity"
+ type="Association_TargetMultiplicityLabel">
+ </mapping>
+ <mapping
+ humanReadableType="TargetRole"
+ type="Association_BranchRoleLabel">
+ </mapping>
+ <mapping
+ humanReadableType="TargetMultiplicity"
+ type="Association_BranchMultiplicityLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="Generalization_StereotypeLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="InterfaceRealization_StereotypeLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Name"
+ type="InterfaceRealization_NameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="Substitution_StereotypeLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Name"
+ type="Substitution_NameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="Realization_StereotypeLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Name"
+ type="Realization_NameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Name"
+ type="Abstraction_NameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="Abstraction_StereotypeLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Name"
+ type="Usage_NameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="Usage_StereotypeLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Name"
+ type="Dependency_NameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="Dependency_StereotypeLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Alias"
+ type="ElementImport_AliasLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="ElementImport_StereotypeLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="PackageImport_StereotypeLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="PackageMerge_StereotypeLabel">
+ </mapping>
+ <mapping
+ humanReadableType="TemplateParameterSubstitution"
+ type="TemplateBinding_SubstitutionLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="TemplateBinding_StereotypeLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="GeneralizationSet_StereotypeLabel">
+ </mapping>
+ <mapping
+ humanReadableType="SourceRole"
+ type="InstanceSpecification_SourceRoleLabel">
+ </mapping>
+ <mapping
+ humanReadableType="TargetRole"
+ type="InstanceSpecification_TargetRoleLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="InformationFlow_StereotypeLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="Constraint_KeywordLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="InstanceSpecification_FloatingNameLabel_CN">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="Component_FloatingNameLabel_CN">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="Signal_FloatingNameLabel_CN">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="Interface_FloatingNameLabel_CN">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="Enumeration_FloatingNameLabel_CN">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="InformationItem_FloatingNameLabel_CN">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="Class_FloatingNameLabel_CN">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="PrimitiveType_FloatingNameLabel_CN">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="DataType_FloatingNameLabel_CN">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="Dependency_FloatingNameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="AssociationClass_FloatingNameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="Association_FloatingNameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="InstanceSpecification_FloatingNameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="Component_FloatingNameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="Signal_FloatingNameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="Interface_FloatingNameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="Enumeration_FloatingNameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="InformationItem_FloatingNameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="Class_FloatingNameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="PrimitiveType_FloatingNameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="DataType_FloatingNameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="DurationObservation_FloatingNameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="DurationObservation_StereotypeLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Floating Label"
+ type="TimeObservation_FloatingNameLabel">
+ </mapping>
+ <mapping
+ humanReadableType="Stereotype"
+ type="TimeObservation_StereotypeLabel">
+ </mapping>
</diagramMappings>
</extension>
<extension
point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
<diagramReconciler
diagramType="RequirementDiagram"
- reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconcilier"
+ reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler"
source="1.0.0"
target="1.1.0">
</diagramReconciler>
+ <diagramReconciler
+ diagramType="RequirementDiagram"
+ reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconcilerForCompartment"
+ source="1.1.0"
+ target="1.2.0">
+ </diagramReconciler>
+ <diagramReconciler
+ diagramType="RequirementDiagram"
+ reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler_1_2_0"
+ source="1.1.0"
+ target="1.2.0">
+ </diagramReconciler>
</extension>
<!-- // End of user code
-->
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java
index ed7d7f6a0cb..f925c69ce51 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java
@@ -16,6 +16,33 @@ package org.eclipse.papyrus.sysml.diagram.requirement.provider;
import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeAbstractionEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeDependencyEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageImportEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeRealizationEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintBodyEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintBodyEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageNameEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
public class ElementTypes extends AbstractElementTypeEnumerator {
@@ -35,125 +62,125 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
/** ClassDiagram :: PACKAGE */
- public static final IHintedType PACKAGE = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_2007"); //$NON-NLS-1$
+ public static final IHintedType PACKAGE = (IHintedType) UMLElementTypes.Package_Shape;
- public static final String PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7016"; //$NON-NLS-1$
+ public static final String PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = PackagePackageableElementCompartmentEditPart.VISUAL_ID;
- public static final String PACKAGE_LABEL_NAME_HINT = "5026"; //$NON-NLS-1$
+ public static final String PACKAGE_LABEL_NAME_HINT = PackageNameEditPart.VISUAL_ID;
/** ClassDiagram :: PACKAGE_CN */
- public static final IHintedType PACKAGE_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_3009"); //$NON-NLS-1$
+ public static final IHintedType PACKAGE_CN = (IHintedType) UMLElementTypes.Package_Shape_CN;
- public static final String PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7010"; //$NON-NLS-1$
+ public static final String PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = PackagePackageableElementCompartmentEditPartCN.VISUAL_ID;
- public static final String PACKAGE_CN_LABEL_NAME_HINT = "5017"; //$NON-NLS-1$
+ public static final String PACKAGE_CN_LABEL_NAME_HINT = PackageNameEditPartCN.VISUAL_ID;
/** ClassDiagram :: CLASS */
- public static final IHintedType CLASS = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_2008"); //$NON-NLS-1$
+ public static final IHintedType CLASS = (IHintedType) UMLElementTypes.Class_Shape;
- public static final String CLASS_COMPARTMENT_ATTRIBUTE_HINT = "7017"; //$NON-NLS-1$
+ public static final String CLASS_COMPARTMENT_ATTRIBUTE_HINT = ClassAttributeCompartmentEditPart.VISUAL_ID;
- public static final String CLASS_COMPARTMENT_OPERATION_HINT = "7018"; //$NON-NLS-1$
+ public static final String CLASS_COMPARTMENT_OPERATION_HINT = ClassOperationCompartmentEditPart.VISUAL_ID;
- public static final String CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT = "7019"; //$NON-NLS-1$
+ public static final String CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT = ClassNestedClassifierCompartmentEditPart.VISUAL_ID;
- public static final String CLASS_LABEL_NAME_HINT = "5029"; //$NON-NLS-1$
+ public static final String CLASS_LABEL_NAME_HINT = ClassNameEditPart.VISUAL_ID;
/** ClassDiagram :: CLASS_CN */
- public static final IHintedType CLASS_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_3010"); //$NON-NLS-1$
+ public static final IHintedType CLASS_CN = (IHintedType) UMLElementTypes.Class_Shape_CN;
- public static final String CLASS_CN_COMPARTMENT_ATTRIBUTE_HINT = "7011"; //$NON-NLS-1$
+ public static final String CLASS_CN_COMPARTMENT_ATTRIBUTE_HINT = ClassAttributeCompartmentEditPartCN.VISUAL_ID;
- public static final String CLASS_CN_COMPARTMENT_OPERATION_HINT = "7012"; //$NON-NLS-1$
+ public static final String CLASS_CN_COMPARTMENT_OPERATION_HINT = ClassOperationCompartmentEditPartCN.VISUAL_ID;
- public static final String CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT = "7013"; //$NON-NLS-1$
+ public static final String CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT = ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID;
- public static final String CLASS_CN_LABEL_NAME_HINT = "5014"; //$NON-NLS-1$
+ public static final String CLASS_CN_LABEL_NAME_HINT = ClassNameEditPartCN.VISUAL_ID;
/** ClassDiagram :: DEFAULT_NAMED_ELEMENT */
- public static final IHintedType DEFAULT_NAMED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.NamedElement_2097"); //$NON-NLS-1$
+ public static final IHintedType DEFAULT_NAMED_ELEMENT = (IHintedType) UMLElementTypes.NamedElement_DefaultShape;
- public static final String DEFAULT_NAMED_ELEMENT_LABEL_NAME_HINT = "5157"; //$NON-NLS-1$
+ public static final String DEFAULT_NAMED_ELEMENT_LABEL_NAME_HINT = DefaultNamedElementNameEditPart.VISUAL_ID;
/** ClassDiagram :: COMMENT */
- public static final IHintedType COMMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"); //$NON-NLS-1$
+ public static final IHintedType COMMENT = (IHintedType) UMLElementTypes.Comment_Shape;
- public static final String COMMENT_LABEL_BODY_HINT = "5038"; //$NON-NLS-1$
+ public static final String COMMENT_LABEL_BODY_HINT = CommentBodyEditPart.VISUAL_ID;
/** ClassDiagram :: COMMENT_CN */
- public static final IHintedType COMMENT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"); //$NON-NLS-1$
+ public static final IHintedType COMMENT_CN = (IHintedType) UMLElementTypes.Comment_Shape_CN;
- public static final String COMMENT_CN_LABEL_BODY_HINT = "5063"; //$NON-NLS-1$
+ public static final String COMMENT_CN_LABEL_BODY_HINT = CommentBodyEditPartCN.VISUAL_ID;
/** ClassDiagram :: CONSTRAINT */
- public static final IHintedType CONSTRAINT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"); //$NON-NLS-1$
+ public static final IHintedType CONSTRAINT = (IHintedType) UMLElementTypes.Constraint_PackagedElementShape;
- public static final String CONSTRAINT_LABEL_NAME_HINT = "5037"; //$NON-NLS-1$
+ public static final String CONSTRAINT_LABEL_NAME_HINT = ConstraintNameEditPart.VISUAL_ID;
- public static final String CONSTRAINT_LABEL_BODY_HINT = "5159"; //$NON-NLS-1$
+ public static final String CONSTRAINT_LABEL_BODY_HINT = ConstraintBodyEditPart.VISUAL_ID;
/** ClassDiagram :: CONSTRAINT_CN */
- public static final IHintedType CONSTRAINT_CN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"); //$NON-NLS-1$
+ public static final IHintedType CONSTRAINT_CN = (IHintedType) UMLElementTypes.Constraint_PackagedElementShape_CN;
- public static final String CONSTRAINT_CN_LABEL_NAME_HINT = "5064"; //$NON-NLS-1$
+ public static final String CONSTRAINT_CN_LABEL_NAME_HINT = ConstraintNameEditPartCN.VISUAL_ID;
- public static final String CONSTRAINT_CN_LABEL_BODY_HINT = "5160"; //$NON-NLS-1$
+ public static final String CONSTRAINT_CN_LABEL_BODY_HINT = ConstraintBodyEditPartCN.VISUAL_ID;
/** ClassDiagram :: ABSTRACTION */
- public static final IHintedType ABSTRACTION = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Abstraction_4006"); //$NON-NLS-1$
+ public static final IHintedType ABSTRACTION = (IHintedType) UMLElementTypes.Abstraction_Edge;
- public static final String ABSTRACTION_LABEL_NAME_HINT = "6014"; //$NON-NLS-1$
+ public static final String ABSTRACTION_LABEL_NAME_HINT = AbstractionNameEditPart.VISUAL_ID;
- public static final String ABSTRACTION_LABEL_APPLIED_STEREOTYPE_HINT = "6015"; //$NON-NLS-1$
+ public static final String ABSTRACTION_LABEL_APPLIED_STEREOTYPE_HINT = AppliedStereotypeAbstractionEditPart.VISUAL_ID;
/** ClassDiagram :: CONTAINMENT_LINK */
- public static final IHintedType CONTAINMENT_LINK = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023"); //$NON-NLS-1$
+ public static final IHintedType CONTAINMENT_LINK = (IHintedType) UMLElementTypes.Element_ContainmentEdge;
/** ClassDiagram :: DEPENDENCY */
- public static final IHintedType DEPENDENCY = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"); //$NON-NLS-1$
+ public static final IHintedType DEPENDENCY = (IHintedType) UMLElementTypes.Dependency_Edge;
- public static final String DEPENDENCY_LABEL_NAME_HINT = "6026"; //$NON-NLS-1$
+ public static final String DEPENDENCY_LABEL_NAME_HINT = DependencyNameEditPart.VISUAL_ID;
- public static final String DEPENDENCY_LABEL_APPLIED_STEREOTYPE_HINT = "6027"; //$NON-NLS-1$
+ public static final String DEPENDENCY_LABEL_APPLIED_STEREOTYPE_HINT = AppliedStereotypeDependencyEditPart.VISUAL_ID;
/** ClassDiagram :: COMMENT_ANNOTATED_ELEMENT */
- public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"); //$NON-NLS-1$
+ public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) UMLElementTypes.Comment_AnnotatedElementEdge;
/** ClassDiagram :: CONSTRAINT_CONSTRAINED_ELEMENT */
- public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014"); //$NON-NLS-1$
+ public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType) UMLElementTypes.Constraint_ConstrainedElementEdge;
/** ClassDiagram :: REALIZATION */
- public static final IHintedType REALIZATION = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Realization_4005"); //$NON-NLS-1$
+ public static final IHintedType REALIZATION = (IHintedType) UMLElementTypes.Realization_Edge;
- public static final String REALIZATION_LABEL_APPLIED_STEREOTYPE_HINT = "6012"; //$NON-NLS-1$
+ public static final String REALIZATION_LABEL_APPLIED_STEREOTYPE_HINT = AppliedStereotypeRealizationEditPart.VISUAL_ID;
- public static final String REALIZATION_LABEL_NAME_HINT = "6013"; //$NON-NLS-1$
+ public static final String REALIZATION_LABEL_NAME_HINT = RealizationNameEditPart.VISUAL_ID;
/** ClassDiagram :: PACKAGE_IMPORT */
- public static final IHintedType PACKAGE_IMPORT = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010"); //$NON-NLS-1$
+ public static final IHintedType PACKAGE_IMPORT = (IHintedType) UMLElementTypes.PackageImport_Edge;
- public static final String PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT = "6022"; //$NON-NLS-1$
+ public static final String PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT = AppliedStereotypePackageImportEditPart.VISUAL_ID;
/** ClassDiagram :: ChildLabelNodes */
- public static final IHintedType CLASS_PROPERTY_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3012"); //$NON-NLS-1$
+ public static final IHintedType CLASS_PROPERTY_CLN = (IHintedType) UMLElementTypes.Property_ClassAttributeLabel;
- public static final IHintedType CLASS_RECEPTION_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Reception_3011"); //$NON-NLS-1$
+ public static final IHintedType CLASS_RECEPTION_CLN = (IHintedType) UMLElementTypes.Reception_ReceptionLabel;
- public static final IHintedType CLASS_OPERATION_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Operation_3013"); //$NON-NLS-1$
+ public static final IHintedType CLASS_OPERATION_CLN = (IHintedType) UMLElementTypes.Operation_ClassOperationLabel;
- public static final IHintedType CLASS_CLASS_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_3014"); //$NON-NLS-1$
+ public static final IHintedType CLASS_CLASS_CLN = (IHintedType) UMLElementTypes.Class_ClassNestedClassifierLabel;
- public static final IHintedType CLASS_INTERFACE_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Interface_3036"); //$NON-NLS-1$
+ public static final IHintedType CLASS_INTERFACE_CLN = (IHintedType) UMLElementTypes.Interface_ClassNestedClassifierLabel;
- public static final IHintedType CLASS_ENUMERATION_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3052"); //$NON-NLS-1$
+ public static final IHintedType CLASS_ENUMERATION_CLN = (IHintedType) UMLElementTypes.Enumeration_ClassNestedClassifierLabel;
- public static final IHintedType CLASS_PRIMITIVE_TYPE_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3047"); //$NON-NLS-1$
+ public static final IHintedType CLASS_PRIMITIVE_TYPE_CLN = (IHintedType) UMLElementTypes.PrimitiveType_ClassNestedClassifierLabel;
- public static final IHintedType CLASS_DATA_TYPE_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.DataType_3044"); //$NON-NLS-1$
+ public static final IHintedType CLASS_DATA_TYPE_CLN = (IHintedType) UMLElementTypes.DataType_ClassNestedClassifierLabel;
- public static final IHintedType CLASS_SIGNAL_CLN = (IHintedType) getElementType("org.eclipse.papyrus.uml.diagram.clazz.Signal_3050"); //$NON-NLS-1$
+ public static final IHintedType CLASS_SIGNAL_CLN = (IHintedType) UMLElementTypes.Signal_ClassNestedClassifierLabel;
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java
index 4f427d4057a..be4e20256d8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java
@@ -54,25 +54,25 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
// createdEdge = super.createEdge(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
if (ElementTypes.ABSTRACTION.getSemanticHint().equals(domainElementGraphicalType)) {
- createdEdge = createAbstraction_4006(domainElement, containerView, index, persisted, preferencesHint);
+ createdEdge = createAbstraction_Edge(domainElement, containerView, index, persisted, preferencesHint);
}
if (ElementTypes.CONTAINMENT_LINK.getSemanticHint().equals(domainElementGraphicalType)) {
- createdEdge = createLink_4023(containerView, index, persisted, preferencesHint);
+ createdEdge = createElement_ContainmentEdge(containerView, index, persisted, preferencesHint);
}
if (ElementTypes.DEPENDENCY.getSemanticHint().equals(domainElementGraphicalType)) {
- createdEdge = createDependency_4008(domainElement, containerView, index, persisted, preferencesHint);
+ createdEdge = createDependency_Edge(domainElement, containerView, index, persisted, preferencesHint);
}
if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
- createdEdge = createCommentAnnotatedElement_4013(containerView, index, persisted, preferencesHint);
+ createdEdge = createComment_AnnotatedElementEdge(containerView, index, persisted, preferencesHint);
}
if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
- createdEdge = createConstraintConstrainedElement_4014(containerView, index, persisted, preferencesHint);
+ createdEdge = createConstraint_ConstrainedElementEdge(containerView, index, persisted, preferencesHint);
}
if (ElementTypes.REALIZATION.getSemanticHint().equals(domainElementGraphicalType)) {
- createdEdge = createRealization_4005(domainElement, containerView, index, persisted, preferencesHint);
+ createdEdge = createRealization_Edge(domainElement, containerView, index, persisted, preferencesHint);
}
if (ElementTypes.PACKAGE_IMPORT.getSemanticHint().equals(domainElementGraphicalType)) {
- createdEdge = createPackageImport_4010(domainElement, containerView, index, persisted, preferencesHint);
+ createdEdge = createPackageImport_Edge(domainElement, containerView, index, persisted, preferencesHint);
}
}
}
@@ -180,18 +180,6 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
}
}
if (elementType == ElementTypes.PACKAGE_CN) {
- // node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@fe0154 (visualID: 3009, editPartClassName: PackageEditPartCN, itemSemanticEditPolicyClassName: PackageItemSemanticEditPolicyCN, notationViewFactoryClassName: null)
- // (canonicalEditPolicyClassName: PackageCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: PackageGraphicalNodeEditPolicyCN, createCommandClassName: PackageCreateCommandCN)
- // containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@57c5b15d (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
- // PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse:
- // false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7e5004f1 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName:
- // ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false,
- // hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3774ab00 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
- // ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false,
- // hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@f0f45e2 (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName:
- // PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false,
- // hideIfEmpty: true, needsTitle: true, listLayout: false)
- // nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@758773cc (name: null) (customPreferencePage: null, generatePreferencePage: false, generateTool: false)
if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
return true;
}
@@ -205,18 +193,6 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
}
}
if (elementType == ElementTypes.CLASS_CN) {
- // node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@49e8801d (visualID: 3010, editPartClassName: ClassEditPartCN, itemSemanticEditPolicyClassName: ClassItemSemanticEditPolicyCN, notationViewFactoryClassName: null)
- // (canonicalEditPolicyClassName: ClassCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ClassGraphicalNodeEditPolicyCN, createCommandClassName: ClassCreateCommandCN)
- // containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7615ece4 (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
- // PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse:
- // false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@49766b48 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName:
- // ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false,
- // hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7d7d69a5 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
- // ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false,
- // hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@45f05c4d (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName:
- // PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false,
- // hideIfEmpty: true, needsTitle: true, listLayout: false)
- // nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@42242af9 (name: null) (customPreferencePage: null, generatePreferencePage: false, generateTool: false)
if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
return true;
}
@@ -236,18 +212,6 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
}
}
if (elementType == ElementTypes.COMMENT_CN) {
- // node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@1e625e00 (visualID: 3028, editPartClassName: CommentEditPartCN, itemSemanticEditPolicyClassName: CommentItemSemanticEditPolicyCN, notationViewFactoryClassName: null)
- // (canonicalEditPolicyClassName: CommentCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: CommentGraphicalNodeEditPolicyCN, createCommandClassName: CommentCreateCommandCN)
- // containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@57c5b15d (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
- // PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse:
- // false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7e5004f1 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName:
- // ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false,
- // hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3774ab00 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
- // ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false,
- // hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@f0f45e2 (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName:
- // PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false,
- // hideIfEmpty: true, needsTitle: true, listLayout: false)
- // nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@4af21bf0 (name: null) (customPreferencePage: null, generatePreferencePage: false, generateTool: false)
if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
return true;
}
@@ -261,18 +225,6 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
}
}
if (elementType == ElementTypes.CONSTRAINT_CN) {
- // node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@4d55cb27 (visualID: 3029, editPartClassName: ConstraintEditPartCN, itemSemanticEditPolicyClassName: ConstraintItemSemanticEditPolicyCN, notationViewFactoryClassName: null)
- // (canonicalEditPolicyClassName: ConstraintCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ConstraintGraphicalNodeEditPolicyCN, createCommandClassName: ConstraintCreateCommandCN)
- // containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@57c5b15d (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
- // PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse:
- // false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7e5004f1 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName:
- // ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false,
- // hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3774ab00 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName:
- // ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false,
- // hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@f0f45e2 (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName:
- // PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false,
- // hideIfEmpty: true, needsTitle: true, listLayout: false)
- // nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@4cbc5fb7 (name: null) (customPreferencePage: null, generatePreferencePage: false, generateTool: false)
if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
return true;
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java
index 2efc535ea3a..6aa348384ab 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java
@@ -36,7 +36,7 @@ public class CustomInheritedElementViewProvider extends InheritedClassDiagramVie
}
@Override
- public Node createClass_2008(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
+ public Node createClass_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
Shape node = NotationFactory.eINSTANCE.createShape();
node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

Back to the top