diff options
| author | Ansgar Radermacher | 2014-03-13 09:41:04 +0000 |
|---|---|---|
| committer | Ansgar Radermacher | 2014-03-13 09:43:42 +0000 |
| commit | 341b47692a28fae23d7d524efc374c5408832c7e (patch) | |
| tree | c765b86611431fe20594f85cc9aebea71465689c /plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model | |
| parent | 601924f9d8b3ee332f20c038fbdf78d93b28a0ca (diff) | |
| download | org.eclipse.papyrus-341b47692a28fae23d7d524efc374c5408832c7e.tar.gz org.eclipse.papyrus-341b47692a28fae23d7d524efc374c5408832c7e.tar.xz org.eclipse.papyrus-341b47692a28fae23d7d524efc374c5408832c7e.zip | |
[Bug 427025] [OCL For Papyrus] Cannot create OCL constraints in Luna
Show wait cursor before editing starts
Re-activate selection of compartment edit part => enable edit on 2nd click
Activate context link tool after constraint creation
Enable xtext editor in UML tab of property view (currently for OCL only)
Diffstat (limited to 'plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model')
| -rw-r--r-- | plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleConstraint.xwt | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleConstraint.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleConstraint.xwt index 2bbedb0a653..b12376d0c68 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleConstraint.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleConstraint.xwt @@ -1,37 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+<Composite
xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+ xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+ xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets"
xmlns="http://www.eclipse.org/xwt/presentation">
<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>
+ <Composite>
+ <Composite.layout>
+ <ppel:PropertiesLayout></ppel:PropertiesLayout>
+ </Composite.layout>
+ <ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></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>
+ <ppel:PropertiesLayout numColumns="1"></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>
\ No newline at end of file |