diff options
| author | Gabriel Pascual | 2015-01-09 09:27:07 +0000 |
|---|---|---|
| committer | Gabriel Pascual | 2015-01-09 09:29:39 +0000 |
| commit | 19abaa1709b62bf8e01960f3de68a2b736b1d193 (patch) | |
| tree | 8a8e501a2b7b534ae7461c0db1c48db69e016110 | |
| parent | 162db13f32d33086eae5faeefb07b5cd06e519bd (diff) | |
| download | org.eclipse.papyrus-19abaa1709b62bf8e01960f3de68a2b736b1d193.tar.gz org.eclipse.papyrus-19abaa1709b62bf8e01960f3de68a2b736b1d193.tar.xz org.eclipse.papyrus-19abaa1709b62bf8e01960f3de68a2b736b1d193.zip | |
418647: [Property Views] Location of package imported models should be
shown
https://bugs.eclipse.org/bugs/show_bug.cgi?id=418647
- Add Location field for Model element
- Move up the field in Properties Views page for Model element and
Package element
Change-Id: I1388eefb9891e3a1e9f2573ba809041e78353d0a
Signed-off-by: Gabriel Pascual <gabriel.pascual@all4tec.net>
| -rw-r--r-- | plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleModel.xwt | 59 | ||||
| -rw-r--r-- | plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePackage.xwt | 15 |
2 files changed, 41 insertions, 33 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleModel.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleModel.xwt index 3a01fc658bb..1cd336819c4 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleModel.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleModel.xwt @@ -1,27 +1,34 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
- xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
- xmlns:j="clr-namespace:java.lang" 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>
- </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:MultiReference input="{Binding}"
- property="UML:Package:packageMerge"></ppe:MultiReference>
- </Composite>
+<?xml version="1.0" encoding="UTF-8"?> +<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" + xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"> + <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> + </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:StringEditor input="{Binding}" + property="ImportedPackage:Package:location" readOnly="true"></ppe:StringEditor> + </Composite> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout></ppel:PropertiesLayout> + </Composite.layout> + <ppe:MultiReference input="{Binding}" + property="UML:Package:packageMerge"></ppe:MultiReference> + </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePackage.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePackage.xwt index 9d51f6278f9..4e0f4d299b0 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePackage.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePackage.xwt @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" - xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" - xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"> +<Composite + xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.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.views.properties.widgets"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout> @@ -21,14 +22,14 @@ <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout> - <ppe:MultiReference input="{Binding}" - property="UML:Package:packageMerge"></ppe:MultiReference> + <ppe:StringEditor input="{Binding}" + property="ImportedPackage:Package:location" readOnly="true"></ppe:StringEditor> </Composite> <Composite> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout> - <ppe:StringEditor input="{Binding}" property="ImportedPackage:Package:location" - readOnly="true"></ppe:StringEditor> + <ppe:MultiReference input="{Binding}" + property="UML:Package:packageMerge"></ppe:MultiReference> </Composite> </Composite>
\ No newline at end of file |