Bug 535544 - [SysML 1.4] Display parameters and constraints in
ConstraintBlock property
- add parameters section (UML:StructuredClassifier:ownedAttribute)
- add constraints section (UML:NamedElement:ownedRule)
Change-Id: I26c5221a64950490a80738df60b3364fdc10385e
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConstraintBlock.xwt b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConstraintBlock.xwt
index a152e97..4cfe2a1 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConstraintBlock.xwt
+++ b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConstraintBlock.xwt
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang"
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+ xmlns:j="clr-namespace:java.lang"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
- xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+ xmlns:x="http://www.eclipse.org/xwt">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
</Composite.layout>
@@ -10,14 +11,17 @@
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
</Composite.layout>
- <ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+ <ppe:StringEditor input="{Binding}"
+ property="UML:NamedElement:name"></ppe:StringEditor>
</Composite>
<Composite>
<Composite.layout>
<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
</Composite.layout>
- <ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
- <ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
+ <ppe:BooleanRadio input="{Binding}"
+ property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+ <ppe:BooleanRadio input="{Binding}"
+ property="UML:Class:isActive"></ppe:BooleanRadio>
<ppe:BooleanRadio input="{Binding}"
property="SysML:Blocks:Block:isEncapsulated"></ppe:BooleanRadio>
<ppe:BooleanRadio input="{Binding}"
@@ -27,6 +31,12 @@
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
</Composite.layout>
- <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
- </Composite>
+ <ppe:EnumCombo input="{Binding}"
+ property="UML:NamedElement:visibility"></ppe:EnumCombo>
+ <ppe:MultiReference input="{Binding}"
+ property="UML:StructuredClassifier:ownedAttribute"
+ customLabel="Parameters"></ppe:MultiReference>
+ <ppe:MultiReference input="{Binding}"
+ property="UML:NamedElement:ownedRule" customLabel="Constraints"></ppe:MultiReference>
+ </Composite>
</Composite>
\ No newline at end of file
