diff options
author | Christian W. Damus | 2016-02-11 02:48:20 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2016-02-12 15:31:41 +0000 |
commit | ecd4928b327f5561364c5068c9ff5f1668e92d13 (patch) | |
tree | 7c34f46cf82a1d65ac753fa92c2a5d55371b8dba /plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties | |
parent | 751a204d74e15eb2db6b41c937691fc56dcc1252 (diff) | |
download | org.eclipse.papyrus-ecd4928b327f5561364c5068c9ff5f1668e92d13.tar.gz org.eclipse.papyrus-ecd4928b327f5561364c5068c9ff5f1668e92d13.tar.xz org.eclipse.papyrus-ecd4928b327f5561364c5068c9ff5f1668e92d13.zip |
Bug 485220: [Architecture] Provide a more modular architecture
https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220
Factor UI dependencies out of the UML Element Types bundle. This includes
moving some advices that interact with the user into a new
org.eclipse.papyrus.uml.service.types.ui bundle.
Pull up the PasteCommandService and IPasteCommandProvider API into the
Infra Diagram layer where the extension point is defined. Deprecate the
old API in the UML layer.
Introduce a service for participation of languages in CSS styling:
* styling reset actions in the Reset Style command
* access to semantic model classes and properties to make available to CSS
Factor PapyrusObservableValue and cohorts out of the UML Tools bundle
into the Infra Layer for more general reuse and to relieve the
Diagram Infrastructure layer of UML dependencies. The old API remains as
deprecated.
Remove the Infra Diagram Layer dependency on UML Layer for property
testers governing deletion in the diagram. Includes introduction of
a new IGraphicalDeletionHelper OSGi service for delegation of the
determination of whether an element can be deleted from the diagram and
replacement of the XML expression properties
* org.eclipse.papyrus.uml.diagram.common.isSemanticDeletion
* org.eclipse.papyrus.uml.diagram.common.isReadOnly
by
* org.eclipse.papyrus.infra.gmfdiag.common.isSemanticDeletion
* org.eclipse.papyrus.infra.gmfdiag.common.canDelete
(where the latter is the negation of the property that it supersedes)
Extract UML dependencies from the Diagram Outline and CSS Editor bundles.
Remove unused MDTUtil APIs that referenced a UML-specific annotation.
Move the Diagram Infrastructure CSS Palette bundle into the UML layer because it
serves to provide extensions on the Palette Service, which is an overtly
UML-specific capability.
All client APIs for the Properties View are moved from
org.eclipse.papyrus.views.properties bundle to a new
org.eclipse.papyrus.infra.properties.ui bundle. This
includes renaming of:
* extension points
* label-provider contexts
* XWT namespaces
Add an "all UI tests" suite.
Define a componentized hierarchical build layout of the main plug-ins
Change-Id: I43f8f3644857a18b69715f5a2f1da9b1cf286d67
Diffstat (limited to 'plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties')
7 files changed, 121 insertions, 121 deletions
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/css.ctx b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/css.ctx index 7acab6a523e..1b6ded15f5c 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/css.ctx +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/css.ctx @@ -95,7 +95,7 @@ <elements xmi:id="_8MrCVIk1EeWBadfj_-2HEQ" name="ModelStyleSheet"> <properties xmi:id="_8MrCVYk1EeWBadfj_-2HEQ" name="stylesheets" label="Model style sheets" type="Reference" multiplicity="-1" description="The style sheets associated to the model"/> </elements> - <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@modelElementFactories.0"/> + <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@modelElementFactories.0"/> </dataContexts> <dataContexts xmi:id="_8MrCVok1EeWBadfj_-2HEQ" name="Preferences" label="Preferences"> <elements xmi:id="_8MrCV4k1EeWBadfj_-2HEQ" name="org.eclipse.papyrus.infra.gmfdiag.css"> diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/MultipleStylableElement.xwt b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/MultipleStylableElement.xwt index 40dbfbfbce4..b5c6f7de370 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/MultipleStylableElement.xwt +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/MultipleStylableElement.xwt @@ -1,12 +1,12 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<Composite
- xmlns:css="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets"
- xmlns="http://www.eclipse.org/xwt/presentation"
- 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">
- <Composite.layout>
- <GridLayout numColumns="1"></GridLayout>
- </Composite.layout>
- <css:ResetStyleWidget input="{Binding}" property="CSS:PapyrusCSSStyle:cssStyle"></css:ResetStyleWidget>
+<?xml version="1.0" encoding="UTF-8"?> +<Composite + xmlns:css="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets" + xmlns="http://www.eclipse.org/xwt/presentation" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" + xmlns:x="http://www.eclipse.org/xwt"> + <Composite.layout> + <GridLayout numColumns="1"></GridLayout> + </Composite.layout> + <css:ResetStyleWidget input="{Binding}" property="CSS:PapyrusCSSStyle:cssStyle"></css:ResetStyleWidget> </Composite>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleDiagram.xwt b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleDiagram.xwt index 4361f29795b..a2f377c116c 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleDiagram.xwt +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleDiagram.xwt @@ -1,39 +1,39 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
- xmlns="http://www.eclipse.org/xwt/presentation"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
- xmlns:x="http://www.eclipse.org/xwt"
- xmlns:css="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets">
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
- </Composite.layout>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:StringLabel input="{Binding}"
- property="Preferences:org.eclipse.papyrus.infra.gmfdiag.css:currentTheme"></ppe:StringLabel>
- </Composite>
- <Composite>
- <Composite.layout>
- <GridLayout></GridLayout>
- </Composite.layout>
- <css:ResetStyleWidget property="CSS:PapyrusCSSStyle:cssStyle"
- input="{Binding}"></css:ResetStyleWidget>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:MultiReference input="{Binding}"
- property="CSS:DiagramStyle:css_stylesheets"></ppe:MultiReference>
- <ppe:MultiReference input="{Binding}"
- property="CSS:ModelStyle:modelStyleSheets"></ppe:MultiReference>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:MultiString input="{Binding}" property="CSS:PapyrusCSSStyle:cssClass"></ppe:MultiString>
- </Composite>
+<?xml version="1.0" encoding="UTF-8"?> +<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" + xmlns="http://www.eclipse.org/xwt/presentation" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:x="http://www.eclipse.org/xwt" + xmlns:css="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets"> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <ppe:StringLabel input="{Binding}" + property="Preferences:org.eclipse.papyrus.infra.gmfdiag.css:currentTheme"></ppe:StringLabel> + </Composite> + <Composite> + <Composite.layout> + <GridLayout></GridLayout> + </Composite.layout> + <css:ResetStyleWidget property="CSS:PapyrusCSSStyle:cssStyle" + input="{Binding}"></css:ResetStyleWidget> + </Composite> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> + </Composite.layout> + <ppe:MultiReference input="{Binding}" + property="CSS:DiagramStyle:css_stylesheets"></ppe:MultiReference> + <ppe:MultiReference input="{Binding}" + property="CSS:ModelStyle:modelStyleSheets"></ppe:MultiReference> + </Composite> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <ppe:MultiString input="{Binding}" property="CSS:PapyrusCSSStyle:cssClass"></ppe:MultiString> + </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleEmbeddedStyleSheet.xwt b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleEmbeddedStyleSheet.xwt index 0af8d6e26c4..da0c1115779 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleEmbeddedStyleSheet.xwt +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleEmbeddedStyleSheet.xwt @@ -1,18 +1,18 @@ -<?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="http://www.eclipse.org/xwt/presentation">
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
- </Composite.layout>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:StringEditor input="{Binding}"
- property="modelstylesheets:EmbeddedStyleSheet:label"></ppe:StringEditor>
- <ppe:StringMultiline input="{Binding}"
- property="modelstylesheets:EmbeddedStyleSheet:content"></ppe:StringMultiline>
- </Composite>
+<?xml version="1.0" encoding="UTF-8"?> +<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" + xmlns:x="http://www.eclipse.org/xwt" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns="http://www.eclipse.org/xwt/presentation"> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <ppe:StringEditor input="{Binding}" + property="modelstylesheets:EmbeddedStyleSheet:label"></ppe:StringEditor> + <ppe:StringMultiline input="{Binding}" + property="modelstylesheets:EmbeddedStyleSheet:content"></ppe:StringMultiline> + </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStylableElement.xwt b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStylableElement.xwt index 827e0614086..69bb939acd8 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStylableElement.xwt +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStylableElement.xwt @@ -1,23 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
- xmlns:css="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets"
- xmlns="http://www.eclipse.org/xwt/presentation"
- 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 numColumns="1"></ppel:PropertiesLayout>
- </Composite.layout>
- <Composite>
- <Composite.layout>
- <GridLayout></GridLayout>
- </Composite.layout>
- <css:ResetStyleWidget input="{Binding}" property="CSS:PapyrusCSSStyle:cssStyle"></css:ResetStyleWidget>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:MultiString input="{Binding}" property="CSS:PapyrusCSSStyle:cssClass"
- customLabel="Applied styles"></ppe:MultiString>
- </Composite>
+<?xml version="1.0" encoding="UTF-8"?> +<Composite xmlns:x="http://www.eclipse.org/xwt" + xmlns:css="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets" + xmlns="http://www.eclipse.org/xwt/presentation" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <Composite> + <Composite.layout> + <GridLayout></GridLayout> + </Composite.layout> + <css:ResetStyleWidget input="{Binding}" property="CSS:PapyrusCSSStyle:cssStyle"></css:ResetStyleWidget> + </Composite> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <ppe:MultiString input="{Binding}" property="CSS:PapyrusCSSStyle:cssClass" + customLabel="Applied styles"></ppe:MultiString> + </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStyleSheetReference.xwt b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStyleSheetReference.xwt index 4be65ab7b03..a6cd887e55f 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStyleSheetReference.xwt +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStyleSheetReference.xwt @@ -1,31 +1,31 @@ -<?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:j="clr-namespace:java.lang"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
- xmlns="http://www.eclipse.org/xwt/presentation">
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
- </Composite.layout>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:StringFileSelector allowFileSystem="false"
- input="{Binding}" allowWorkspace="true"
- property="modelstylesheets:StyleSheetReference:path">
- <ppe:StringFileSelector.filterNames>
- <x:Array Type="j:String">
- <j:String>CSS Stylesheets</j:String>
- <j:String>All</j:String>
- </x:Array>
- </ppe:StringFileSelector.filterNames>
- <ppe:StringFileSelector.filterExtensions>
- <x:Array Type="j:String">
- <j:String>*.css</j:String>
- <j:String>*</j:String>
- </x:Array>
- </ppe:StringFileSelector.filterExtensions>
- </ppe:StringFileSelector>
- </Composite>
+<?xml version="1.0" encoding="UTF-8"?> +<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" + xmlns:x="http://www.eclipse.org/xwt" + xmlns:j="clr-namespace:java.lang" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns="http://www.eclipse.org/xwt/presentation"> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <ppe:StringFileSelector allowFileSystem="false" + input="{Binding}" allowWorkspace="true" + property="modelstylesheets:StyleSheetReference:path"> + <ppe:StringFileSelector.filterNames> + <x:Array Type="j:String"> + <j:String>CSS Stylesheets</j:String> + <j:String>All</j:String> + </x:Array> + </ppe:StringFileSelector.filterNames> + <ppe:StringFileSelector.filterExtensions> + <x:Array Type="j:String"> + <j:String>*.css</j:String> + <j:String>*</j:String> + </x:Array> + </ppe:StringFileSelector.filterExtensions> + </ppe:StringFileSelector> + </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleTheme.xwt b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleTheme.xwt index cb7b2c841c5..358cc9713ab 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleTheme.xwt +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleTheme.xwt @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:css="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" - xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns:x="http://www.eclipse.org/xwt"> <Composite.layout> <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> |