Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2013-10-28 06:03:37 -0400
committerCamille Letavernier2013-10-28 06:05:41 -0400
commit99c85a43de4733d08796a99c5892eaf26ce50bdd (patch)
treeae4b518eaa41af2b3c7452aa146a3717ed983393 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model
parent90b3c71cc9e954f4e3a5d1389e49af029b5f567b (diff)
downloadorg.eclipse.papyrus-99c85a43de4733d08796a99c5892eaf26ce50bdd.tar.gz
org.eclipse.papyrus-99c85a43de4733d08796a99c5892eaf26ce50bdd.tar.xz
org.eclipse.papyrus-99c85a43de4733d08796a99c5892eaf26ce50bdd.zip
417376: [Sequence Diagram] Display the behavior of Execution
specification as a label https://bugs.eclipse.org/bugs/show_bug.cgi?id=417376
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model')
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/seq.ctx35
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/ui/DisplayBehaviorSection.xwt11
3 files changed, 36 insertions, 11 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi
index e8934cad6db..926e37b589b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi
@@ -5,5 +5,6 @@
<modelElementFactories name="Interaction Operand Factory" factoryClass="org.eclipse.papyrus.uml.diagram.sequence.util.InteractionOperandModelElementFactory"/>
<modelElementFactories name="Gate Factory" factoryClass="org.eclipse.papyrus.uml.diagram.sequence.util.GateModelElementFactory"/>
<modelElementFactories name="Link Route Factory" factoryClass="org.eclipse.papyrus.uml.diagram.sequence.util.LinkRouteModelElementFactory"/>
+ <modelElementFactories name="Behavior Factory" factoryClass="org.eclipse.papyrus.uml.diagram.sequence.util.BehaviorDisplayHelper"/>
<constraintTypes label="Duration Link Constraint" constraintClass="org.eclipse.papyrus.uml.diagram.sequence.util.DurationLinkConstraint"/>
</environment:Environment>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/seq.ctx b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/seq.ctx
index b174a33884b..52c1aa04741 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/seq.ctx
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/seq.ctx
@@ -14,11 +14,14 @@
<widget href="ui/InteractionOperandGuardVisibility.xwt#/"/>
</sections>
<sections name="LinkRoute" sectionFile="ui/LinkRoute.xwt">
- <widget href="ui/LinkRoute.xwt#/"/>
- </sections>
+ <widget href="ui/LinkRoute.xwt#/"/>
+ </sections>
<sections name="GateNameSection" sectionFile="ui/GateNameSection.xwt">
<widget href="ui/GateNameSection.xwt#/"/>
</sections>
+ <sections name="DisplayBehaviorSection" sectionFile="ui/DisplayBehaviorSection.xwt">
+ <widget href="ui/DisplayBehaviorSection.xwt#/"/>
+ </sections>
</tabs>
<views name="CombinedFragmentTitle" sections="//@tabs.0/@sections.0" automaticContext="true">
<constraints xsi:type="constraints:SimpleConstraint" name="isSingleCombinedFragment">
@@ -46,17 +49,23 @@
</constraints>
</views>
<views name="LinkRoute" sections="//@tabs.0/@sections.4">
- <constraints xsi:type="constraints:SimpleConstraint" name="isMLinkRoute">
- <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="constraints:ValueProperty" name="sourcePart" value="org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart"/>
- </constraints>
- </views>
+ <constraints xsi:type="constraints:SimpleConstraint" name="isMLinkRoute">
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi#//@constraintTypes.0"/>
+ <properties xsi:type="constraints:ValueProperty" name="sourcePart" value="org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart"/>
+ </constraints>
+ </views>
<views name="GateName" sections="//@tabs.0/@sections.5">
<constraints xsi:type="constraints:SimpleConstraint" name="isGate">
<constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="constraints:ValueProperty" name="umlClassName" value="Gate"/>
</constraints>
</views>
+ <views name="DisplayBehavior" sections="//@tabs.0/@sections.6">
+ <constraints xsi:type="constraints:SimpleConstraint" name="isBehaviorExecutionSpecification">
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>
+ <properties xsi:type="constraints:ValueProperty" name="umlClassName" value="BehaviorExecutionSpecification"/>
+ </constraints>
+ </views>
<dataContexts name="Preference" label="Preference">
<elements name="org.eclipse.papyrus.infra.gmfdiag.preferences">
<properties name="ELEMENT_PapyrusUMLSequenceDiagram_CombinedFragment_CombinedFragmentCompartment.compartment_name.visibility" label="Show name" type="Boolean" description="Show the Title in the diagram"/>
@@ -87,13 +96,17 @@
<modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi#//@modelElementFactories.2"/>
</dataContexts>
<dataContexts name="LinkRoute" label="Link Route">
- <elements name="Routing">
- <properties name="style"/>
- </elements>
- <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi#//@modelElementFactories.4"/>
+ <elements name="Routing">
+ <properties name="style"/>
+ </elements>
+ <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi#//@modelElementFactories.4"/>
</dataContexts>
<dataContexts name="Gate" label="Gate">
<properties name="showName" label="Show Name" type="Boolean" description="Show name on diagram."/>
<modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi#//@modelElementFactories.3"/>
</dataContexts>
+ <dataContexts name="Behavior" label="Behavior">
+ <properties name="displayBehavior" label="Display" type="Boolean" description="Display Behavior Label."/>
+ <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi#//@modelElementFactories.5"/>
+ </dataContexts>
</contexts:Context>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/ui/DisplayBehaviorSection.xwt b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/ui/DisplayBehaviorSection.xwt
new file mode 100644
index 00000000000..61618138542
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/ui/DisplayBehaviorSection.xwt
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+ xmlns="http://www.eclipse.org/xwt/presentation">
+ <Composite.layout>
+ <ppel:PropertiesLayout></ppel:PropertiesLayout>
+ </Composite.layout>
+ <ppe:BooleanCheckbox input="{Binding}"
+ property="Behavior:displayBehavior" customLabel="Display Behavior Label."></ppe:BooleanCheckbox>
+</Composite> \ No newline at end of file

Back to the top