diff options
Diffstat (limited to 'plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML')
3 files changed, 13 insertions, 19 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx index d0d4bedb039..1490dcefe42 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx @@ -4546,7 +4546,7 @@ </elements>
<elements name="Trigger" supertypes="//@dataContexts.0/@elements.4">
<properties name="event" type="Reference" description="The event that causes the trigger."/>
- <properties name="port" type="Reference" description="A optional port of the receiver object on which the behavioral feature is invoked."/>
+ <properties name="port" type="Reference" multiplicity="-1" description="A optional port of the receiver object on which the behavioral feature is invoked."/>
</elements>
<elements name="Event" supertypes="//@dataContexts.0/@elements.3"/>
<elements name="Port" supertypes="//@dataContexts.0/@elements.35">
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultiplePort.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultiplePort.xwt index a02598d88d5..90b1711e117 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultiplePort.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultiplePort.xwt @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+<Composite
xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
- xmlns:x="http://www.eclipse.org/xwt">
+ xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+ xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
</Composite.layout>
@@ -23,8 +23,7 @@ <ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
<ppe:BooleanRadio input="{Binding}"
property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
- <ppe:BooleanRadio property="UML:Port:isConjugated"
- input="{Binding}"></ppe:BooleanRadio>
+ <ppe:BooleanRadio input="{Binding}" property="UML:Port:isConjugated"></ppe:BooleanRadio>
</Composite>
<Composite>
<Composite.layout>
@@ -32,5 +31,7 @@ </Composite.layout>
<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+ <ppe:ReferenceDialog property="UML:TypedElement:type"
+ input="{Binding}"></ppe:ReferenceDialog>
</Composite>
</Composite>
\ No newline at end of file diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTrigger.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTrigger.xwt index 21ae379355b..0e81d304c04 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTrigger.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTrigger.xwt @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
- xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
- xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+ xmlns:j="clr-namespace:java.lang"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
</Composite.layout>
@@ -10,17 +11,9 @@ <ppel:PropertiesLayout></ppel:PropertiesLayout>
</Composite.layout>
<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout></ppel:PropertiesLayout>
- </Composite.layout>
<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout></ppel:PropertiesLayout>
- </Composite.layout>
<ppe:ReferenceDialog input="{Binding}" property="UML:Trigger:event"></ppe:ReferenceDialog>
+ <ppe:MultiReference property="UML:Trigger:port"
+ input="{Binding}"></ppe:MultiReference>
</Composite>
</Composite>
\ No newline at end of file |