diff options
| author | Nicolas FAUVERGUE | 2018-06-15 13:14:16 +0000 |
|---|---|---|
| committer | Nicolas FAUVERGUE | 2018-06-29 09:28:23 +0000 |
| commit | 5ae69abe0c488b0c97de86932dfc965386a802ce (patch) | |
| tree | be2bf914b99559e97ee3ac03efae6f6f2b3c0fe1 /plugins/uml/properties | |
| parent | 97b8becdb934c8ba1e5440d92da4ccab75ec4ce8 (diff) | |
| download | org.eclipse.papyrus-5ae69abe0c488b0c97de86932dfc965386a802ce.tar.gz org.eclipse.papyrus-5ae69abe0c488b0c97de86932dfc965386a802ce.tar.xz org.eclipse.papyrus-5ae69abe0c488b0c97de86932dfc965386a802ce.zip | |
Bug 535714: [ActivityDiagram] Activity Constraints properties view are
not standardized
Re-layout the properties view for constraint.
Change-Id: I5f603379e02e3e25200b5ee7df6382ff779e4c2f
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>
Diffstat (limited to 'plugins/uml/properties')
3 files changed, 61 insertions, 79 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDurationConstraint.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDurationConstraint.xwt index d74b3a1327c..ce7cdd57b4d 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDurationConstraint.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDurationConstraint.xwt @@ -1,45 +1,40 @@ <?xml version="1.0" encoding="UTF-8"?> -<Composite xmlns:x="http://www.eclipse.org/xwt" - xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" - xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"> +<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:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets" + xmlns:x="http://www.eclipse.org/xwt"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout> <Composite> <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:label"></ppe:StringEditor> - </Composite> - <Composite> - <Composite.layout> - <ppel:PropertiesLayout></ppel:PropertiesLayout> + <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> - <ppe:MultiReference input="{Binding}" - property="UML:DurationConstraint:firstEvent"></ppe:MultiReference> + <Composite> + <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:label"></ppe:StringEditor> + <ppe:MultiReference input="{Binding}" property="UML:DurationConstraint:firstEvent"></ppe:MultiReference> + </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:Constraint:context"></ppe:ReferenceDialog> + <ppe:MultiReference input="{Binding}" + property="UML:Constraint:constrainedElement"></ppe:MultiReference> + </Composite> </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:Constraint:context"></ppe:ReferenceDialog> <ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:specification"></ppe:ReferenceDialog> </Composite> - <Composite> - <Composite.layout> - <ppel:PropertiesLayout></ppel:PropertiesLayout> - </Composite.layout> - <ppe:MultiReference input="{Binding}" - property="UML:Constraint:constrainedElement"></ppe:MultiReference> - </Composite> -</Composite> +</Composite>
\ No newline at end of file diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleIntervalConstraint.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleIntervalConstraint.xwt index 872e49af156..a4bd1686dd3 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleIntervalConstraint.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleIntervalConstraint.xwt @@ -1,38 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> <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:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" - xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"> + xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets" + xmlns:x="http://www.eclipse.org/xwt"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout> <Composite> <Composite.layout> - <ppel:PropertiesLayout></ppel:PropertiesLayout> + <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> - <ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor> - <ppe:StringEditor input="{Binding}" property="UML:NamedElement:label"></ppe:StringEditor> + <Composite> + <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:label"></ppe:StringEditor> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" + property="UML:Constraint:context"></ppe:ReferenceDialog> + </Composite> + <ppe:MultiReference input="{Binding}" + property="UML:Constraint:constrainedElement"></ppe:MultiReference> </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:Constraint:context"></ppe:ReferenceDialog> <ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:specification"></ppe:ReferenceDialog> </Composite> - <Composite> - <Composite.layout> - <ppel:PropertiesLayout></ppel:PropertiesLayout> - </Composite.layout> - <ppe:MultiReference input="{Binding}" - property="UML:Constraint:constrainedElement"></ppe:MultiReference> - </Composite> -</Composite> +</Composite>
\ No newline at end of file diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTimeConstraint.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTimeConstraint.xwt index 56ac23cd10c..b00b22099f4 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTimeConstraint.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleTimeConstraint.xwt @@ -1,44 +1,35 @@ <?xml version="1.0" encoding="UTF-8"?> -<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" - xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" - xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"> +<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:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets" + xmlns:x="http://www.eclipse.org/xwt"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout> <Composite> <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:label"></ppe:StringEditor> - </Composite> - <Composite> - <Composite.layout> - <ppel:PropertiesLayout></ppel:PropertiesLayout> + <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> - <ppe:BooleanRadio input="{Binding}" - property="UML:TimeConstraint:firstEvent"></ppe:BooleanRadio> + <Composite> + <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:label"></ppe:StringEditor> + <ppe:BooleanRadio input="{Binding}" property="UML:TimeConstraint:firstEvent"></ppe:BooleanRadio> + <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + </Composite> + <ppe:MultiReference input="{Binding}" + property="UML:Constraint:constrainedElement"></ppe:MultiReference> </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:Constraint:context"></ppe:ReferenceDialog> + property="UML:Constraint:context"></ppe:ReferenceDialog> <ppe:ReferenceDialog input="{Binding}" property="UML:Constraint:specification"></ppe:ReferenceDialog> </Composite> - <Composite> - <Composite.layout> - <ppel:PropertiesLayout></ppel:PropertiesLayout> - </Composite.layout> - <ppe:MultiReference input="{Binding}" - property="UML:Constraint:constrainedElement"></ppe:MultiReference> - </Composite> -</Composite> +</Composite>
\ No newline at end of file |