diff options
21 files changed, 57 insertions, 126 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleActivityParameterNode.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleActivityParameterNode.xwt index 6e81ff787b5..ce6e88d8208 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleActivityParameterNode.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleActivityParameterNode.xwt @@ -26,18 +26,18 @@ <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> <ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo> - <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" + property="UML:ObjectNode:selection"></ppe:ReferenceDialog> </Composite> <Composite> <Composite.layout> <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> <ppe:ReferenceDialog input="{Binding}" property="UML:ActivityParameterNode:parameter"></ppe:ReferenceDialog> <ppe:ReferenceDialog input="{Binding}" - property="UML:ObjectNode:selection"></ppe:ReferenceDialog> - <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> - <ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog> </Composite> <Composite> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleCentralBufferNode.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleCentralBufferNode.xwt index 0ab329198cf..b1ef9796f4a 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleCentralBufferNode.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleCentralBufferNode.xwt @@ -26,14 +26,14 @@ <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> <ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo> - <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" + property="UML:ObjectNode:selection"></ppe:ReferenceDialog> </Composite> <Composite> <Composite.layout> <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> - <ppe:ReferenceDialog input="{Binding}" - property="UML:ObjectNode:selection"></ppe:ReferenceDialog> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> <ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDuration.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDuration.xwt index dd143a29616..410301ed685 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDuration.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDuration.xwt @@ -13,18 +13,13 @@ </Composite.layout> <ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor> <ppe:StringEditor input="{Binding}" property="UML:NamedElement:label"></ppe:StringEditor> - </Composite> - <Composite> - <Composite.layout> - <ppel:PropertiesLayout></ppel:PropertiesLayout> - </Composite.layout> - <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" property="UML:Duration:expr"></ppe:ReferenceDialog> </Composite> <Composite> <Composite.layout> <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> - <ppe:ReferenceDialog input="{Binding}" property="UML:Duration:expr"></ppe:ReferenceDialog> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> </Composite> <Composite> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDurationInterval.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDurationInterval.xwt index f21ddfd590d..11bcc4decfc 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDurationInterval.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDurationInterval.xwt @@ -16,16 +16,11 @@ </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 numColumns="2"></ppel:PropertiesLayout> </Composite.layout> <ppe:ReferenceDialog input="{Binding}" property="UML:Interval:min"></ppe:ReferenceDialog> <ppe:ReferenceDialog input="{Binding}" property="UML:Interval:max"></ppe:ReferenceDialog> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> </Composite> </Composite> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleExpansionNode.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleExpansionNode.xwt index 1fa44ec3096..83cf18bae67 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleExpansionNode.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleExpansionNode.xwt @@ -26,18 +26,18 @@ <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> <ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo> - <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" + property="UML:ObjectNode:selection"></ppe:ReferenceDialog> + <ppe:ReferenceDialog input="{Binding}" + property="UML:ExpansionNode:regionAsInput"></ppe:ReferenceDialog> + <ppe:ReferenceDialog input="{Binding}" + property="UML:ExpansionNode:regionAsOutput"></ppe:ReferenceDialog> </Composite> <Composite> <Composite.layout> <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> - <ppe:ReferenceDialog input="{Binding}" - property="UML:ExpansionNode:regionAsInput"></ppe:ReferenceDialog> - <ppe:ReferenceDialog input="{Binding}" - property="UML:ExpansionNode:regionAsOutput"></ppe:ReferenceDialog> - <ppe:ReferenceDialog input="{Binding}" - property="UML:ObjectNode:selection"></ppe:ReferenceDialog> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> <ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleExpression.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleExpression.xwt index b704f65f21d..12f12b0b339 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleExpression.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleExpression.xwt @@ -8,7 +8,7 @@ </Composite.layout> <Composite> <Composite.layout> - <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> + <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout> <ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor> <ppe:StringEditor input="{Binding}" property="UML:NamedElement:label"></ppe:StringEditor> @@ -16,14 +16,9 @@ </Composite> <Composite> <Composite.layout> - <ppel:PropertiesLayout></ppel:PropertiesLayout> + <ppel:PropertiesLayout numColumns="2"></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 property="UML:TypedElement:type" input="{Binding}"></ppe:ReferenceDialog> </Composite> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleExtensionEnd.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleExtensionEnd.xwt index 9e0aa897cfe..3669fa0987d 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleExtensionEnd.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleExtensionEnd.xwt @@ -34,16 +34,17 @@ </Composite.layout> <ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation" readOnly="true"></ppe:EnumCombo> - <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> </Composite> <Composite> <Composite.layout> <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> + <uml:MultiplicityDialog input="{Binding}" + property="Multiplicity:multiplicity"></uml:MultiplicityDialog> <ppe:ReferenceDialog input="{Binding}" property="UML:Property:defaultValue"></ppe:ReferenceDialog> - <ppe:EnumCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumCombo> - <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> </Composite> <Composite> <Composite.layout> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleInputPin.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleInputPin.xwt index a808a61fb8e..8c098dc1872 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleInputPin.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleInputPin.xwt @@ -31,18 +31,18 @@ <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> <ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo> - <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" + property="UML:ObjectNode:selection"></ppe:ReferenceDialog> </Composite> <Composite> <Composite.layout> <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> <uml:MultiplicityDialog input="{Binding}" property="Multiplicity:multiplicity"></uml:MultiplicityDialog> <ppe:ReferenceDialog input="{Binding}" - property="UML:ObjectNode:selection"></ppe:ReferenceDialog> - <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> - <ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog> </Composite> <Composite> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleInstanceValue.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleInstanceValue.xwt index cde9c2a6af3..8d14e32b4d0 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleInstanceValue.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleInstanceValue.xwt @@ -12,19 +12,14 @@ </Composite.layout> <ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor> <ppe:StringEditor input="{Binding}" property="UML:NamedElement:label"></ppe:StringEditor> - </Composite> - <Composite> - <Composite.layout> - <ppel:PropertiesLayout></ppel:PropertiesLayout> - </Composite.layout> - <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" + property="UML:InstanceValue:instance"></ppe:ReferenceDialog> </Composite> <Composite> <Composite.layout> <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> - <ppe:ReferenceDialog input="{Binding}" - property="UML:InstanceValue:instance"></ppe:ReferenceDialog> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> <ppe:ReferenceDialog property="UML:TypedElement:type" input="{Binding}"></ppe:ReferenceDialog> </Composite> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleInterval.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleInterval.xwt index 9d10edca305..9e5fa0fe04f 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleInterval.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleInterval.xwt @@ -15,16 +15,11 @@ </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 numColumns="2"></ppel:PropertiesLayout> </Composite.layout> <ppe:ReferenceDialog input="{Binding}" property="UML:Interval:min"></ppe:ReferenceDialog> <ppe:ReferenceDialog input="{Binding}" property="UML:Interval:max"></ppe:ReferenceDialog> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> </Composite> </Composite> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleLiteralSpecification.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleLiteralSpecification.xwt index b4f451b3eae..7e162b616d3 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleLiteralSpecification.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleLiteralSpecification.xwt @@ -15,14 +15,9 @@ </Composite> <Composite> <Composite.layout> - <ppel:PropertiesLayout></ppel:PropertiesLayout> + <ppel:PropertiesLayout numColumns="2"></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 property="UML:TypedElement:type" input="{Binding}"></ppe:ReferenceDialog> </Composite> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleOpaqueExpression.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleOpaqueExpression.xwt index d0b23bcfe8f..172c573b142 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleOpaqueExpression.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleOpaqueExpression.xwt @@ -25,14 +25,14 @@ <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout> - <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" + property="UML:OpaqueExpression:behavior"></ppe:ReferenceDialog> </Composite> <Composite> <Composite.layout> <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> - <ppe:ReferenceDialog input="{Binding}" - property="UML:OpaqueExpression:behavior"></ppe:ReferenceDialog> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleOutputPin.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleOutputPin.xwt index a808a61fb8e..8c098dc1872 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleOutputPin.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleOutputPin.xwt @@ -31,18 +31,18 @@ <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> <ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo> - <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" + property="UML:ObjectNode:selection"></ppe:ReferenceDialog> </Composite> <Composite> <Composite.layout> <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> <uml:MultiplicityDialog input="{Binding}" property="Multiplicity:multiplicity"></uml:MultiplicityDialog> <ppe:ReferenceDialog input="{Binding}" - property="UML:ObjectNode:selection"></ppe:ReferenceDialog> - <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> - <ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog> </Composite> <Composite> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleParameter.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleParameter.xwt index d2e27b9bbec..2f764a9509b 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleParameter.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleParameter.xwt @@ -31,14 +31,9 @@ <ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo> <ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo> <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> - </Composite> - <Composite> - <Composite.layout> - <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> - </Composite.layout> + <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> + <uml:MultiplicityDialog input="{Binding}" property="Multiplicity:multiplicity"></uml:MultiplicityDialog> <ppe:ReferenceDialog input="{Binding}" property="UML:Parameter:defaultValue"></ppe:ReferenceDialog> - <uml:MultiplicityDialog input="{Binding}" property="Multiplicity:multiplicity"></uml:MultiplicityDialog> - <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePort.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePort.xwt index ed5b9a3a029..58e85e31066 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePort.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePort.xwt @@ -28,19 +28,14 @@ </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 numColumns="2"></ppel:PropertiesLayout> </Composite.layout> - <ppe:ReferenceDialog input="{Binding}" - property="UML:Property:defaultValue"></ppe:ReferenceDialog> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> <uml:MultiplicityDialog input="{Binding}" property="Multiplicity:multiplicity"></uml:MultiplicityDialog> - <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> + <ppe:ReferenceDialog input="{Binding}" + property="UML:Property:defaultValue"></ppe:ReferenceDialog> </Composite> <Composite> <Composite.layout> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleStringExpression.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleStringExpression.xwt index bd2c3b3f069..99b3a2707e3 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleStringExpression.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleStringExpression.xwt @@ -9,7 +9,7 @@ </Composite.layout> <Composite> <Composite.layout> - <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> + <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout> <ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor> <ppe:StringEditor input="{Binding}" property="UML:NamedElement:label"></ppe:StringEditor> @@ -17,14 +17,9 @@ </Composite> <Composite> <Composite.layout> - <ppel:PropertiesLayout></ppel:PropertiesLayout> + <ppel:PropertiesLayout numColumns="2"></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 property="UML:TypedElement:type" input="{Binding}"></ppe:ReferenceDialog> </Composite> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleStructuralFeature.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleStructuralFeature.xwt index 28db7132ba7..7a860afcc7d 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleStructuralFeature.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleStructuralFeature.xwt @@ -28,16 +28,11 @@ </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 numColumns="2"></ppel:PropertiesLayout> </Composite.layout> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> <uml:MultiplicityDialog input="{Binding}" property="Multiplicity:multiplicity"></uml:MultiplicityDialog> - <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTimeExpression.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTimeExpression.xwt index 49466ed4c9e..f94239ebabd 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTimeExpression.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTimeExpression.xwt @@ -12,19 +12,14 @@ </Composite.layout> <ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor> <ppe:StringEditor input="{Binding}" property="UML:NamedElement:label"></ppe:StringEditor> - </Composite> - <Composite> - <Composite.layout> - <ppel:PropertiesLayout></ppel:PropertiesLayout> - </Composite.layout> - <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" + property="UML:TimeExpression:expr"></ppe:ReferenceDialog> </Composite> <Composite> <Composite.layout> <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> - <ppe:ReferenceDialog input="{Binding}" - property="UML:TimeExpression:expr"></ppe:ReferenceDialog> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> <ppe:ReferenceDialog property="UML:TypedElement:type" input="{Binding}"></ppe:ReferenceDialog> </Composite> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTimeInterval.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTimeInterval.xwt index 3f0bb674a65..5d111c17a5d 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTimeInterval.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTimeInterval.xwt @@ -16,16 +16,11 @@ </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 numColumns="2"></ppel:PropertiesLayout> </Composite.layout> - <ppe:ReferenceDialog input="{Binding}" property="UML:Interval:max"></ppe:ReferenceDialog> <ppe:ReferenceDialog input="{Binding}" property="UML:Interval:min"></ppe:ReferenceDialog> + <ppe:ReferenceDialog input="{Binding}" property="UML:Interval:max"></ppe:ReferenceDialog> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog> </Composite> </Composite> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleValueSpecification.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleValueSpecification.xwt index 46cb44f0fda..e6f5395b5b6 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleValueSpecification.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleValueSpecification.xwt @@ -15,14 +15,9 @@ </Composite> <Composite> <Composite.layout> - <ppel:PropertiesLayout></ppel:PropertiesLayout> + <ppel:PropertiesLayout numColumns="2"></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:TypedElement:type"></ppe:ReferenceDialog> </Composite> </Composite> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleVariable.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleVariable.xwt index 52814d74e7e..a3328717f57 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleVariable.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleVariable.xwt @@ -25,16 +25,11 @@ </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 numColumns="2"></ppel:PropertiesLayout> </Composite.layout> - <uml:MultiplicityDialog input="{Binding}" property="Multiplicity:multiplicity"></uml:MultiplicityDialog> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> <ppe:ReferenceDialog property="UML:TypedElement:type" input="{Binding}"></ppe:ReferenceDialog> + <uml:MultiplicityDialog input="{Binding}" property="Multiplicity:multiplicity"></uml:MultiplicityDialog> </Composite> </Composite>
\ No newline at end of file |