Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrschnekenbu2013-05-03 09:16:12 +0000
committerrschnekenbu2013-05-03 09:16:12 +0000
commitdd8ba6c0fced800e422a93fb481d28f053ab4322 (patch)
tree2d55244bf20ef536c6bb82bd80b490ec054474c2 /plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model
parent5a32ed77886af55369ed21a0bcb1e98c59ed9909 (diff)
downloadorg.eclipse.papyrus-dd8ba6c0fced800e422a93fb481d28f053ab4322.tar.gz
org.eclipse.papyrus-dd8ba6c0fced800e422a93fb481d28f053ab4322.tar.xz
org.eclipse.papyrus-dd8ba6c0fced800e422a93fb481d28f053ab4322.zip
394893: [All Diagrams] Papyrus shall support symbols in the diagrams
https://bugs.eclipse.org/bugs/show_bug.cgi?id=394893
Diffstat (limited to 'plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model')
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi35
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/notation.ctx15
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDecorableElement.xwt20
3 files changed, 45 insertions, 25 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi
index b35d2881598..7c44093d06f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi
@@ -1,27 +1,12 @@
<?xml version="1.0" encoding="ASCII"?>
-<environment:Environment
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:environment="http://www.eclipse.org/papyrus/properties/environment/0.9">
- <constraintTypes
- label="GMF Appearance Constraint"
- constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.AppearanceConstraint"/>
- <constraintTypes
- label="HasEditPolicy"
- constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.HasEditPolicy"/>
- <constraintTypes
- label="isGMFEditPart"
- constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.IsEditPartConstraint"/>
- <constraintTypes
- label="GMF Notation Constraint"
- constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.GMFNotationConstraint"/>
- <modelElementFactories
- name="GMF Appearance Factory"
- factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.AppearanceModelElementFactory"/>
- <modelElementFactories
- name="GMF Custom Style"
- factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.CustomStyleModelElementFactory"/>
- <modelElementFactories
- name="GMF Notation Factory"
- factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.NotationModelElementFactory"/>
+<environment:Environment xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:environment="http://www.eclipse.org/papyrus/properties/environment/0.9">
+ <constraintTypes label="GMF Appearance Constraint" constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.AppearanceConstraint"/>
+ <constraintTypes label="HasEditPolicy" constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.HasEditPolicy"/>
+ <constraintTypes label="isGMFEditPart" constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.IsEditPartConstraint"/>
+ <constraintTypes label="GMF Notation Constraint" constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.GMFNotationConstraint"/>
+ <constraintTypes label="isDecorableElementConstraint" constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.IsDecorableElementConstraint"/>
+ <modelElementFactories name="GMF Appearance Factory" factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.AppearanceModelElementFactory"/>
+ <modelElementFactories name="GMF Custom Style" factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.CustomStyleModelElementFactory"/>
+ <modelElementFactories name="GMF Notation Factory" factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.NotationModelElementFactory"/>
+ <modelElementFactories name="Decorated Element Factory" factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.DecoratedModelElementFactory"/>
</environment:Environment>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/notation.ctx b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/notation.ctx
index 41490475b08..244e96c83c8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/notation.ctx
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/notation.ctx
@@ -175,6 +175,9 @@
<sections name="Multiple SemanticListCompartment" sectionFile="ui/MultipleSemanticListCompartment.xwt">
<widget href="ui/MultipleSemanticListCompartment.xwt#/"/>
</sections>
+ <sections name="SingleDecorableElement" sectionFile="ui/SingleDecorableElement.xwt">
+ <widget href="ui/SingleDecorableElement.xwt#/"/>
+ </sections>
</tabs>
<views name="Single Diagram" sections="//@tabs.0/@sections.12" automaticContext="true" datacontexts="//@dataContexts.0/@elements.12">
<constraints xsi:type="constraints:SimpleConstraint" name="isSingleDiagram">
@@ -183,6 +186,11 @@
<properties xsi:type="constraints:ValueProperty" name="className" value="Diagram"/>
</constraints>
</views>
+ <views name="Single Decorable Element" sections="//@tabs.0/@sections.58" automaticContext="true" datacontexts="//@dataContexts.1/@elements.0">
+ <constraints xsi:type="constraints:SimpleConstraint" name="isDecorableElementConstraint">
+ <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.4"/>
+ </constraints>
+ </views>
<views name="Single Edge" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
<constraints xsi:type="constraints:SimpleConstraint" name="isSingleEdge">
<constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
@@ -664,4 +672,11 @@
<elements name="SemanticListCompartment" supertypes="//@dataContexts.0/@elements.27"/>
<modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.2"/>
</dataContexts>
+ <dataContexts name="decoratedElement" label="decoratedElement">
+ <elements name="ShapeDecorableElement">
+ <properties name="shape_visibility" label="" type="Boolean" description="Boolean that indicates if the decorations should be visible or not"/>
+ <properties name="shape_direction" type="Reference" description="Direction where the decorations should be placed."/>
+ </elements>
+ <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.3"/>
+ </dataContexts>
</contexts:Context>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDecorableElement.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDecorableElement.xwt
new file mode 100644
index 00000000000..bd207f160d5
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDecorableElement.xwt
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+ xmlns:x="http://www.eclipse.org/xwt">
+ <Composite.layout>
+ <ppel:PropertiesLayout></ppel:PropertiesLayout>
+ </Composite.layout>
+ <Group text="Shape Decoration">
+ <Group.layout>
+ <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+ </Group.layout>
+ <ppe:BooleanRadio input="{Binding}"
+ property="decoratedElement:ShapeDecorableElement:shape_visibility"
+ customLabel="Visible"></ppe:BooleanRadio>
+ <ppe:ReferenceCombo input="{Binding}"
+ property="decoratedElement:ShapeDecorableElement:shape_direction"
+ customLabel="Position"></ppe:ReferenceCombo>
+ </Group>
+</Composite> \ No newline at end of file

Back to the top