diff options
| author | glefur | 2011-01-01 23:10:26 +0000 |
|---|---|---|
| committer | glefur | 2011-01-01 23:10:26 +0000 |
| commit | 4a9a6e3b39886b7f502328e589dc4481524f0113 (patch) | |
| tree | cc1531be6add7b66acb55dc88b06746bd28d5932 /tests/org.eclipse.emf.examples.eef.edit | |
| parent | e04db4a289fc0e392ec078ffcf706aafb29d9d07 (diff) | |
| download | org.eclipse.eef-4a9a6e3b39886b7f502328e589dc4481524f0113.tar.gz org.eclipse.eef-4a9a6e3b39886b7f502328e589dc4481524f0113.tar.xz org.eclipse.eef-4a9a6e3b39886b7f502328e589dc4481524f0113.zip | |
ADDED: name and overview properties for Conference
UPDATED: Synchronized generation with new EEF version
Diffstat (limited to 'tests/org.eclipse.emf.examples.eef.edit')
21 files changed, 688 insertions, 107 deletions
diff --git a/tests/org.eclipse.emf.examples.eef.edit/models/conference.components b/tests/org.eclipse.emf.examples.eef.edit/models/conference.components index bae626de3..62fdd0b97 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/models/conference.components +++ b/tests/org.eclipse.emf.examples.eef.edit/models/conference.components @@ -4,176 +4,191 @@ <categories xmi:id="_KvJBIJkmEd6sxtwdpecy3w" name="conference"> <bindings xsi:type="eef-components:PropertiesEditionComponent" xmi:id="_KvJBIZkmEd6sxtwdpecy3w" name="Conference" views="_KvJoMZkmEd6sxtwdpecy3w"> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_OJpU8JktEd6sxtwdpecy3w" name="place" views="_KvJoM5kmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/place"/> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/place"/> </properties> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_P9i7gJktEd6sxtwdpecy3w" name="sites" views="_KvJoN5kmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EReference" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/sites"/> + <model xsi:type="ecore:EReference" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/sites"/> </properties> - <model xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Conference"/> + <properties xsi:type="eef-components:PropertiesEditionElement" name="name" views="/1/@categories.0/@views.0/@elements.0/@elements.0" helpID=""> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/name"/> + </properties> + <properties xsi:type="eef-components:PropertiesEditionElement" name="overview" views="/1/@categories.0/@views.0/@elements.0/@elements.1" helpID=""> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/overview"/> + </properties> + <model xsi:type="ecore:EClass" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference"/> </bindings> <bindings xsi:type="eef-components:PropertiesEditionComponent" xmi:id="_KvJBJ5kmEd6sxtwdpecy3w" name="Person" views="_KvJoOJkmEd6sxtwdpecy3w _OTvo8JkpEd6sxtwdpecy3w"> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBKJkmEd6sxtwdpecy3w" name="firstname" views="_KvJoOpkmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/> </properties> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBKZkmEd6sxtwdpecy3w" name="lastname" views="_KvJoO5kmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/lastname"/> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person/lastname"/> </properties> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBKpkmEd6sxtwdpecy3w" name="age" views="_KvJoPJkmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/age"/> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person/age"/> </properties> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBK5kmEd6sxtwdpecy3w" name="eclipseCommiter" views="_KvJoPZkmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/eclipseCommiter"/> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person/eclipseCommiter"/> </properties> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBLJkmEd6sxtwdpecy3w" name="assists" views="_KvJoPpkmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EReference" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/assists"/> + <model xsi:type="ecore:EReference" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person/assists"/> </properties> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBLZkmEd6sxtwdpecy3w" name="gender" views="_KvJoP5kmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/gender"/> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person/gender"/> </properties> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBLpkmEd6sxtwdpecy3w" name="isRegistered" views="_KvJoQJkmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/isRegistered"/> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person/isRegistered"/> </properties> - <model xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person"/> + <model xsi:type="ecore:EClass" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person"/> </bindings> <bindings xsi:type="eef-components:PropertiesEditionComponent" xmi:id="_KvJBL5kmEd6sxtwdpecy3w" name="Talk" views="_KvJoQZkmEd6sxtwdpecy3w"> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBMJkmEd6sxtwdpecy3w" name="title" views="_KvJoQ5kmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Talk/title"/> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Talk/title"/> </properties> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBMZkmEd6sxtwdpecy3w" name="topic" views="_KvJoRJkmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EReference" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Talk/topic"/> + <model xsi:type="ecore:EReference" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Talk/topic"/> </properties> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBMpkmEd6sxtwdpecy3w" name="type" views="_KvJoRZkmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Talk/type"/> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Talk/type"/> </properties> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBM5kmEd6sxtwdpecy3w" name="presenter" views="_KvJoRpkmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EReference" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Talk/presenter"/> + <model xsi:type="ecore:EReference" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Talk/presenter"/> </properties> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBNJkmEd6sxtwdpecy3w" name="creator" views="_KvJoR5kmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EReference" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Talk/creator"/> + <model xsi:type="ecore:EReference" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Talk/creator"/> </properties> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBNZkmEd6sxtwdpecy3w" name="documentation" views="_KvJoSJkmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Talk/documentation"/> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Talk/documentation"/> </properties> - <model xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Talk"/> + <model xsi:type="ecore:EClass" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Talk"/> </bindings> <bindings xsi:type="eef-components:PropertiesEditionComponent" xmi:id="_KvJBNpkmEd6sxtwdpecy3w" name="Topic" views="_KvJoSZkmEd6sxtwdpecy3w"> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBN5kmEd6sxtwdpecy3w" name="description" views="_KvJoS5kmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Topic/description"/> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Topic/description"/> </properties> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBOJkmEd6sxtwdpecy3w" name="references" views="_KvKPQJkmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Topic/references"/> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Topic/references"/> </properties> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBOZkmEd6sxtwdpecy3w" name="documentation" views="_KvKPQZkmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Topic/documentation"/> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Topic/documentation"/> </properties> - <model xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Topic"/> + <model xsi:type="ecore:EClass" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Topic"/> </bindings> <bindings xsi:type="eef-components:PropertiesEditionComponent" xmi:id="_KvJBOpkmEd6sxtwdpecy3w" name="Site" views="_KvKPQpkmEd6sxtwdpecy3w"> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBPJkmEd6sxtwdpecy3w" name="name" views="_KvKPRZkmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Site/name"/> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Site/name"/> </properties> <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_KvJBO5kmEd6sxtwdpecy3w" name="documentation" views="_KvKPRJkmEd6sxtwdpecy3w"> - <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Site/documentation"/> + <model xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Site/documentation"/> </properties> - <model xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Site"/> + <model xsi:type="ecore:EClass" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Site"/> </bindings> </categories> - <model href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.genmodel#//conference"/> + <model href="../../org.eclipse.emf.examples.eef/model/conference.genmodel#//conference"/> </eef-components:PropertiesEditionContext> <eef-views:ViewsRepository xmi:id="_KvJBPZkmEd6sxtwdpecy3w" documentation="Views repository for conference GenPackage" name="conference"> <RepositoryKind>SWT</RepositoryKind> <RepositoryKind>Form</RepositoryKind> <categories xmi:id="_KvJoMJkmEd6sxtwdpecy3w" name="conference"> <views xmi:id="_KvJoMZkmEd6sxtwdpecy3w" name="Conference"> + <elements xsi:type="eef-views:Container" name="Properties"> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4"/> + <elements xsi:type="eef-views:ElementEditor" name="name"> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> + </elements> + <elements xsi:type="eef-views:ElementEditor" name="overview"> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> + </elements> + </elements> <elements xsi:type="eef-views:Container" xmi:id="_KvJoMpkmEd6sxtwdpecy3w" name="Localisation"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4"/> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoM5kmEd6sxtwdpecy3w" name="place"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> </elements> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoN5kmEd6sxtwdpecy3w" name="sites"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.7"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.7"/> </elements> </elements> </views> <views xmi:id="_KvJoOJkmEd6sxtwdpecy3w" name="Person"> <elements xsi:type="eef-views:Container" xmi:id="_KvJoOZkmEd6sxtwdpecy3w" name="Identity"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4"/> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoOpkmEd6sxtwdpecy3w" name="firstname"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> </elements> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoO5kmEd6sxtwdpecy3w" name="lastname"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> </elements> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoPJkmEd6sxtwdpecy3w" name="age"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> </elements> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoP5kmEd6sxtwdpecy3w" name="gender"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.2"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.2"/> </elements> </elements> <elements xsi:type="eef-views:Container" xmi:id="_cxbP8JkoEd6sxtwdpecy3w" name="Eclipse Status"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4"/> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoPZkmEd6sxtwdpecy3w" name="eclipseCommiter"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1"/> </elements> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoQJkmEd6sxtwdpecy3w" name="isRegistered"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1"/> </elements> </elements> </views> <views xmi:id="_OTvo8JkpEd6sxtwdpecy3w" name="Presence"> <elements xsi:type="eef-views:Container" xmi:id="_Qi9SgJkpEd6sxtwdpecy3w" name="Talks"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4"/> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoPpkmEd6sxtwdpecy3w" name="assists"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.8"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.8"/> </elements> </elements> </views> <views xmi:id="_KvJoQZkmEd6sxtwdpecy3w" name="Talk"> <elements xsi:type="eef-views:Container" xmi:id="_KvJoQpkmEd6sxtwdpecy3w" name="properties"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4"/> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoQ5kmEd6sxtwdpecy3w" name="title"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> </elements> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoRJkmEd6sxtwdpecy3w" name="topic"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.0"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.0"/> </elements> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoRZkmEd6sxtwdpecy3w" name="type"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.2"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.2"/> </elements> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoRpkmEd6sxtwdpecy3w" name="presenter"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.0"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.0"/> </elements> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoR5kmEd6sxtwdpecy3w" name="creator"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.0"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.0"/> </elements> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoSJkmEd6sxtwdpecy3w" name="documentation"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.2"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.2"/> </elements> </elements> </views> <views xmi:id="_KvJoSZkmEd6sxtwdpecy3w" name="Topic"> <elements xsi:type="eef-views:Container" xmi:id="_KvJoSpkmEd6sxtwdpecy3w" name="properties"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4"/> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvJoS5kmEd6sxtwdpecy3w" name="description"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> </elements> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvKPQJkmEd6sxtwdpecy3w" name="references"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.3"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.3"/> </elements> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvKPQZkmEd6sxtwdpecy3w" name="documentation"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.2"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.2"/> </elements> </elements> </views> <views xmi:id="_KvKPQpkmEd6sxtwdpecy3w" name="Site"> <elements xsi:type="eef-views:Container" xmi:id="_KvKPQ5kmEd6sxtwdpecy3w" name="properties"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4"/> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvKPRZkmEd6sxtwdpecy3w" name="name"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0"/> </elements> <elements xsi:type="eef-views:ElementEditor" xmi:id="_KvKPRJkmEd6sxtwdpecy3w" name="documentation"> - <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.2"/> + <representation href="../../../plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.2"/> </elements> </elements> </views> diff --git a/tests/org.eclipse.emf.examples.eef.edit/plugin.properties b/tests/org.eclipse.emf.examples.eef.edit/plugin.properties index d3fc9d476..176a314a2 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/plugin.properties +++ b/tests/org.eclipse.emf.examples.eef.edit/plugin.properties @@ -2,7 +2,7 @@ # <copyright> # </copyright> # -# $Id: plugin.properties,v 1.2 2010/03/17 13:47:34 glefur Exp $ +# $Id: plugin.properties,v 1.3 2011/01/01 23:10:26 glefur Exp $ pluginName = Conference Edit Support providerName = www.example.org @@ -85,3 +85,5 @@ _UI_Topic_references_description = Some references on this topic _UI_Topic_documentation_description = Information about this topic _UI_Site_documentation_description = Information about this site _UI_Site_name_description = Name of the place +_UI_Conference_name_feature = Name +_UI_Conference_overview_feature = Overview diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/ConferencePropertiesEditionComponent.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/ConferencePropertiesEditionComponent.java index 36884d536..ae1d958f6 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/ConferencePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/ConferencePropertiesEditionComponent.java @@ -87,6 +87,12 @@ public class ConferencePropertiesEditionComponent extends SinglePartPropertiesEd sitesSettings = new ReferencesTableSettings(conference, ConferencePackage.eINSTANCE.getConference_Sites()); basePart.initSites(sitesSettings); + if (conference.getName() != null) + basePart.setName(EEFConverterUtil.convertToString(EcorePackage.eINSTANCE.getEString(), conference.getName())); + + if (conference.getOverview() != null) + basePart.setOverview(EEFConverterUtil.convertToString(EcorePackage.eINSTANCE.getEString(), conference.getOverview())); + // init filters basePart.addFilterToSites(new ViewerFilter() { @@ -102,8 +108,10 @@ public class ConferencePropertiesEditionComponent extends SinglePartPropertiesEd }); // Start of user code for additional businessfilters for sites - - // End of user code + + // End of user code + + // init values for referenced views @@ -117,6 +125,8 @@ public class ConferencePropertiesEditionComponent extends SinglePartPropertiesEd + + /** * {@inheritDoc} * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#updateSemanticModel(org.eclipse.emf.eef.runtime.api.notify.IPropertiesEditionEvent) @@ -154,6 +164,12 @@ public class ConferencePropertiesEditionComponent extends SinglePartPropertiesEd sitesSettings.removeFromReference((EObject) event.getNewValue()); } } + if (ConferenceViewsRepository.Conference_.Properties.name == event.getAffectedEditor()) { + conference.setName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue())); + } + if (ConferenceViewsRepository.Conference_.Properties.overview == event.getAffectedEditor()) { + conference.setOverview((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.eINSTANCE.getEString(), (String)event.getNewValue())); + } } /** @@ -171,6 +187,20 @@ public class ConferencePropertiesEditionComponent extends SinglePartPropertiesEd } if (ConferencePackage.eINSTANCE.getConference_Sites().equals(msg.getFeature())) basePart.updateSites(); + if (ConferencePackage.eINSTANCE.getConference_Name().equals(msg.getFeature()) && basePart != null){ + if (msg.getNewValue() != null) { + basePart.setName(EcoreUtil.convertToString(EcorePackage.eINSTANCE.getEString(), msg.getNewValue())); + } else { + basePart.setName(""); + } + } + if (ConferencePackage.eINSTANCE.getConference_Overview().equals(msg.getFeature()) && basePart != null){ + if (msg.getNewValue() != null) { + basePart.setOverview(EcoreUtil.convertToString(EcorePackage.eINSTANCE.getEString(), msg.getNewValue())); + } else { + basePart.setOverview(""); + } + } } @@ -182,7 +212,7 @@ public class ConferencePropertiesEditionComponent extends SinglePartPropertiesEd * */ public boolean isRequired(Object key, int kind) { - return key == ConferenceViewsRepository.Conference_.Localisation.place; + return key == ConferenceViewsRepository.Conference_.Localisation.place || key == ConferenceViewsRepository.Conference_.Properties.name; } /** @@ -208,12 +238,28 @@ public class ConferencePropertiesEditionComponent extends SinglePartPropertiesEd public Diagnostic validateValue(IPropertiesEditionEvent event) { Diagnostic ret = Diagnostic.OK_INSTANCE; if (event.getNewValue() != null) { - String newStringValue = event.getNewValue().toString(); try { if (ConferenceViewsRepository.Conference_.Localisation.place == event.getAffectedEditor()) { - Object newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getConference_Place().getEAttributeType(), newStringValue); + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getConference_Place().getEAttributeType(), (String)newValue); + } ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getConference_Place().getEAttributeType(), newValue); } + if (ConferenceViewsRepository.Conference_.Properties.name == event.getAffectedEditor()) { + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getConference_Name().getEAttributeType(), (String)newValue); + } + ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getConference_Name().getEAttributeType(), newValue); + } + if (ConferenceViewsRepository.Conference_.Properties.overview == event.getAffectedEditor()) { + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getConference_Overview().getEAttributeType(), (String)newValue); + } + ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getConference_Overview().getEAttributeType(), newValue); + } } catch (IllegalArgumentException iae) { ret = BasicDiagnostic.toDiagnostic(iae); } catch (WrappedException we) { diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/PersonBasePropertiesEditionComponent.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/PersonBasePropertiesEditionComponent.java index 602ac34ff..1ae7ec2a0 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/PersonBasePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/PersonBasePropertiesEditionComponent.java @@ -216,30 +216,47 @@ public class PersonBasePropertiesEditionComponent extends SinglePartPropertiesEd public Diagnostic validateValue(IPropertiesEditionEvent event) { Diagnostic ret = Diagnostic.OK_INSTANCE; if (event.getNewValue() != null) { - String newStringValue = event.getNewValue().toString(); try { if (ConferenceViewsRepository.Person.Identity.firstname == event.getAffectedEditor()) { - Object newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getPerson_Firstname().getEAttributeType(), newStringValue); + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getPerson_Firstname().getEAttributeType(), (String)newValue); + } ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getPerson_Firstname().getEAttributeType(), newValue); } if (ConferenceViewsRepository.Person.Identity.lastname == event.getAffectedEditor()) { - Object newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getPerson_Lastname().getEAttributeType(), newStringValue); + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getPerson_Lastname().getEAttributeType(), (String)newValue); + } ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getPerson_Lastname().getEAttributeType(), newValue); } if (ConferenceViewsRepository.Person.Identity.age == event.getAffectedEditor()) { - Object newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getPerson_Age().getEAttributeType(), newStringValue); + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getPerson_Age().getEAttributeType(), (String)newValue); + } ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getPerson_Age().getEAttributeType(), newValue); } if (ConferenceViewsRepository.Person.EclipseStatus.eclipseCommiter == event.getAffectedEditor()) { - Object newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getPerson_EclipseCommiter().getEAttributeType(), newStringValue); + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getPerson_EclipseCommiter().getEAttributeType(), (String)newValue); + } ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getPerson_EclipseCommiter().getEAttributeType(), newValue); } if (ConferenceViewsRepository.Person.Identity.gender == event.getAffectedEditor()) { - Object newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getPerson_Gender().getEAttributeType(), newStringValue); + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getPerson_Gender().getEAttributeType(), (String)newValue); + } ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getPerson_Gender().getEAttributeType(), newValue); } if (ConferenceViewsRepository.Person.EclipseStatus.isRegistered == event.getAffectedEditor()) { - Object newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getPerson_IsRegistered().getEAttributeType(), newStringValue); + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getPerson_IsRegistered().getEAttributeType(), (String)newValue); + } ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getPerson_IsRegistered().getEAttributeType(), newValue); } } catch (IllegalArgumentException iae) { diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/PersonPresencePropertiesEditionComponent.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/PersonPresencePropertiesEditionComponent.java index 47239f144..25b627945 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/PersonPresencePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/PersonPresencePropertiesEditionComponent.java @@ -94,8 +94,8 @@ public class PersonPresencePropertiesEditionComponent extends SinglePartProperti }); presencePart.addFilterToAssists(new EObjectFilter(ConferencePackage.eINSTANCE.getTalk())); // Start of user code for additional businessfilters for assists - - // End of user code + + // End of user code // init values for referenced views @@ -181,7 +181,6 @@ public class PersonPresencePropertiesEditionComponent extends SinglePartProperti public Diagnostic validateValue(IPropertiesEditionEvent event) { Diagnostic ret = Diagnostic.OK_INSTANCE; if (event.getNewValue() != null) { - String newStringValue = event.getNewValue().toString(); try { } catch (IllegalArgumentException iae) { ret = BasicDiagnostic.toDiagnostic(iae); diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/SitePropertiesEditionComponent.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/SitePropertiesEditionComponent.java index 6307ca4fb..45cf59a6c 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/SitePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/SitePropertiesEditionComponent.java @@ -159,14 +159,19 @@ public class SitePropertiesEditionComponent extends SinglePartPropertiesEditingC public Diagnostic validateValue(IPropertiesEditionEvent event) { Diagnostic ret = Diagnostic.OK_INSTANCE; if (event.getNewValue() != null) { - String newStringValue = event.getNewValue().toString(); try { if (ConferenceViewsRepository.Site.Properties.name == event.getAffectedEditor()) { - Object newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getSite_Name().getEAttributeType(), newStringValue); + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getSite_Name().getEAttributeType(), (String)newValue); + } ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getSite_Name().getEAttributeType(), newValue); } if (ConferenceViewsRepository.Site.Properties.documentation == event.getAffectedEditor()) { - Object newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getSite_Documentation().getEAttributeType(), newStringValue); + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getSite_Documentation().getEAttributeType(), (String)newValue); + } ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getSite_Documentation().getEAttributeType(), newValue); } } catch (IllegalArgumentException iae) { diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/TalkPropertiesEditionComponent.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/TalkPropertiesEditionComponent.java index 0aebce4f9..28a1206c7 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/TalkPropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/TalkPropertiesEditionComponent.java @@ -132,8 +132,8 @@ public class TalkPropertiesEditionComponent extends SinglePartPropertiesEditingC }); // Start of user code for additional businessfilters for topic - - // End of user code + + // End of user code basePart.addFilterToPresenter(new ViewerFilter() { @@ -149,8 +149,8 @@ public class TalkPropertiesEditionComponent extends SinglePartPropertiesEditingC }); // Start of user code for additional businessfilters for presenter - - // End of user code + + // End of user code basePart.addFilterToCreator(new ViewerFilter() { @@ -165,8 +165,8 @@ public class TalkPropertiesEditionComponent extends SinglePartPropertiesEditingC }); // Start of user code for additional businessfilters for creator - - // End of user code + + // End of user code // init values for referenced views @@ -325,18 +325,26 @@ public class TalkPropertiesEditionComponent extends SinglePartPropertiesEditingC public Diagnostic validateValue(IPropertiesEditionEvent event) { Diagnostic ret = Diagnostic.OK_INSTANCE; if (event.getNewValue() != null) { - String newStringValue = event.getNewValue().toString(); try { if (ConferenceViewsRepository.Talk.Properties.title_ == event.getAffectedEditor()) { - Object newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getTalk_Title().getEAttributeType(), newStringValue); + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getTalk_Title().getEAttributeType(), (String)newValue); + } ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getTalk_Title().getEAttributeType(), newValue); } if (ConferenceViewsRepository.Talk.Properties.type == event.getAffectedEditor()) { - Object newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getTalk_Type().getEAttributeType(), newStringValue); + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getTalk_Type().getEAttributeType(), (String)newValue); + } ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getTalk_Type().getEAttributeType(), newValue); } if (ConferenceViewsRepository.Talk.Properties.documentation == event.getAffectedEditor()) { - Object newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getTalk_Documentation().getEAttributeType(), newStringValue); + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getTalk_Documentation().getEAttributeType(), (String)newValue); + } ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getTalk_Documentation().getEAttributeType(), newValue); } } catch (IllegalArgumentException iae) { diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/TopicPropertiesEditionComponent.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/TopicPropertiesEditionComponent.java index 45ab5d7ea..b461a3d81 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/TopicPropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/TopicPropertiesEditionComponent.java @@ -12,6 +12,7 @@ package org.eclipse.emf.samples.conference.components; // Start of user code for imports +import java.util.Iterator; import java.util.List; import org.eclipse.emf.common.notify.Notification; @@ -131,9 +132,9 @@ public class TopicPropertiesEditionComponent extends SinglePartPropertiesEditing } if (ConferencePackage.eINSTANCE.getTopic_References().equals(msg.getFeature()) && basePart != null) { if (msg.getEventType() == Notification.ADD) - basePart.addToReferences((java.lang.String) msg.getNewValue()); + basePart.addToReferences(msg.getNewValue()); else if (msg.getEventType() == Notification.REMOVE) - basePart.removeToReferences((java.lang.String) msg.getNewValue()); + basePart.removeToReferences(msg.getOldValue()); } if (ConferencePackage.eINSTANCE.getTopic_Documentation().equals(msg.getFeature()) && basePart != null){ @@ -182,18 +183,26 @@ public class TopicPropertiesEditionComponent extends SinglePartPropertiesEditing public Diagnostic validateValue(IPropertiesEditionEvent event) { Diagnostic ret = Diagnostic.OK_INSTANCE; if (event.getNewValue() != null) { - String newStringValue = event.getNewValue().toString(); try { if (ConferenceViewsRepository.Topic.Properties.description == event.getAffectedEditor()) { - Object newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getTopic_Description().getEAttributeType(), newStringValue); + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getTopic_Description().getEAttributeType(), (String)newValue); + } ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getTopic_Description().getEAttributeType(), newValue); } if (ConferenceViewsRepository.Topic.Properties.references == event.getAffectedEditor()) { - Object newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getTopic_References().getEAttributeType(), newStringValue); - ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getTopic_References().getEAttributeType(), newValue); + BasicDiagnostic chain = new BasicDiagnostic(); + for (Iterator iterator = ((List)event.getNewValue()).iterator(); iterator.hasNext();) { + chain.add(Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getTopic_References().getEAttributeType(), iterator.next())); + } + ret = chain; } if (ConferenceViewsRepository.Topic.Properties.documentation == event.getAffectedEditor()) { - Object newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getTopic_Documentation().getEAttributeType(), newStringValue); + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EcoreUtil.createFromString(ConferencePackage.eINSTANCE.getTopic_Documentation().getEAttributeType(), (String)newValue); + } ret = Diagnostician.INSTANCE.validate(ConferencePackage.eINSTANCE.getTopic_Documentation().getEAttributeType(), newValue); } } catch (IllegalArgumentException iae) { diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/ConferencePropertiesEditionPart.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/ConferencePropertiesEditionPart.java index 71410a731..9242d2c2b 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/ConferencePropertiesEditionPart.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/ConferencePropertiesEditionPart.java @@ -26,6 +26,34 @@ import org.eclipse.jface.viewers.ViewerFilter; public interface ConferencePropertiesEditionPart { /** + * @return the name + * + */ + public String getName(); + + /** + * Defines a new name + * @param newValue the new name to set + * + */ + public void setName(String newValue); + + + /** + * @return the overview + * + */ + public String getOverview(); + + /** + * Defines a new overview + * @param newValue the new overview to set + * + */ + public void setOverview(String newValue); + + + /** * @return the place * */ diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/ConferenceViewsRepository.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/ConferenceViewsRepository.java index c7d0d17a8..789952886 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/ConferenceViewsRepository.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/ConferenceViewsRepository.java @@ -26,6 +26,17 @@ public class ConferenceViewsRepository { * */ public static class Conference_ { + public static class Properties { + + + public static String name = "conference::Conference_::Properties::name"; + + + public static String overview = "conference::Conference_::Properties::overview"; + + + } + public static class Localisation { diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/ConferencePropertiesEditionPartForm.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/ConferencePropertiesEditionPartForm.java index 9f3641f5a..7d87a56ed 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/ConferencePropertiesEditionPartForm.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/ConferencePropertiesEditionPartForm.java @@ -40,6 +40,8 @@ import org.eclipse.swt.events.FocusAdapter; import org.eclipse.swt.events.FocusEvent; import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -57,6 +59,8 @@ import org.eclipse.ui.forms.widgets.Section; */ public class ConferencePropertiesEditionPartForm extends CompositePropertiesEditionPart implements IFormPropertiesEditionPart, ConferencePropertiesEditionPart { + protected Text name; + protected Text overview; protected Text place; protected ReferencesTable sites; protected List<ViewerFilter> sitesBusinessFilters = new ArrayList<ViewerFilter>(); @@ -100,6 +104,10 @@ public class ConferencePropertiesEditionPartForm extends CompositePropertiesEdit */ public void createControls(final FormToolkit widgetFactory, Composite view) { CompositionSequence conference_Step = new CompositionSequence(); + CompositionStep propertiesStep = conference_Step.addStep(ConferenceViewsRepository.Conference_.Properties.class); + propertiesStep.addStep(ConferenceViewsRepository.Conference_.Properties.name); + propertiesStep.addStep(ConferenceViewsRepository.Conference_.Properties.overview); + CompositionStep localisationStep = conference_Step.addStep(ConferenceViewsRepository.Conference_.Localisation.class); localisationStep.addStep(ConferenceViewsRepository.Conference_.Localisation.place); localisationStep.addStep(ConferenceViewsRepository.Conference_.Localisation.sites); @@ -109,6 +117,15 @@ public class ConferencePropertiesEditionPartForm extends CompositePropertiesEdit @Override public Composite addToPart(Composite parent, Object key) { + if (key == ConferenceViewsRepository.Conference_.Properties.class) { + return createPropertiesGroup(widgetFactory, parent); + } + if (key == ConferenceViewsRepository.Conference_.Properties.name) { + return createNameText(widgetFactory, parent); + } + if (key == ConferenceViewsRepository.Conference_.Properties.overview) { + return createOverviewText(widgetFactory, parent); + } if (key == ConferenceViewsRepository.Conference_.Localisation.class) { return createLocalisationGroup(widgetFactory, parent); } @@ -126,6 +143,103 @@ public class ConferencePropertiesEditionPartForm extends CompositePropertiesEdit /** * */ + protected Composite createPropertiesGroup(FormToolkit widgetFactory, final Composite parent) { + Section propertiesSection = widgetFactory.createSection(parent, Section.TITLE_BAR | Section.TWISTIE | Section.EXPANDED); + propertiesSection.setText(ConferenceMessages.ConferencePropertiesEditionPart_PropertiesGroupLabel); + GridData propertiesSectionData = new GridData(GridData.FILL_HORIZONTAL); + propertiesSectionData.horizontalSpan = 3; + propertiesSection.setLayoutData(propertiesSectionData); + Composite propertiesGroup = widgetFactory.createComposite(propertiesSection); + GridLayout propertiesGroupLayout = new GridLayout(); + propertiesGroupLayout.numColumns = 3; + propertiesGroup.setLayout(propertiesGroupLayout); + propertiesSection.setClient(propertiesGroup); + return propertiesGroup; + } + + + protected Composite createNameText(FormToolkit widgetFactory, Composite parent) { + FormUtils.createPartLabel(widgetFactory, parent, ConferenceMessages.ConferencePropertiesEditionPart_NameLabel, propertiesEditionComponent.isRequired(ConferenceViewsRepository.Conference_.Properties.name, ConferenceViewsRepository.FORM_KIND)); + name = widgetFactory.createText(parent, ""); //$NON-NLS-1$ + name.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER); + widgetFactory.paintBordersFor(parent); + GridData nameData = new GridData(GridData.FILL_HORIZONTAL); + name.setLayoutData(nameData); + name.addFocusListener(new FocusAdapter() { + /** + * @see org.eclipse.swt.events.FocusAdapter#focusLost(org.eclipse.swt.events.FocusEvent) + * + */ + @Override + @SuppressWarnings("synthetic-access") + public void focusLost(FocusEvent e) { + if (propertiesEditionComponent != null) + propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ConferencePropertiesEditionPartForm.this, ConferenceViewsRepository.Conference_.Properties.name, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, name.getText())); + } + }); + name.addKeyListener(new KeyAdapter() { + /** + * @see org.eclipse.swt.events.KeyAdapter#keyPressed(org.eclipse.swt.events.KeyEvent) + * + */ + @Override + @SuppressWarnings("synthetic-access") + public void keyPressed(KeyEvent e) { + if (e.character == SWT.CR) { + if (propertiesEditionComponent != null) + propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ConferencePropertiesEditionPartForm.this, ConferenceViewsRepository.Conference_.Properties.name, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, name.getText())); + } + } + }); + EditingUtils.setID(name, ConferenceViewsRepository.Conference_.Properties.name); + EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$ + FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Conference_.Properties.name, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$ + return parent; + } + + + protected Composite createOverviewText(FormToolkit widgetFactory, Composite parent) { + FormUtils.createPartLabel(widgetFactory, parent, ConferenceMessages.ConferencePropertiesEditionPart_OverviewLabel, propertiesEditionComponent.isRequired(ConferenceViewsRepository.Conference_.Properties.overview, ConferenceViewsRepository.FORM_KIND)); + overview = widgetFactory.createText(parent, ""); //$NON-NLS-1$ + overview.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER); + widgetFactory.paintBordersFor(parent); + GridData overviewData = new GridData(GridData.FILL_HORIZONTAL); + overview.setLayoutData(overviewData); + overview.addFocusListener(new FocusAdapter() { + /** + * @see org.eclipse.swt.events.FocusAdapter#focusLost(org.eclipse.swt.events.FocusEvent) + * + */ + @Override + @SuppressWarnings("synthetic-access") + public void focusLost(FocusEvent e) { + if (propertiesEditionComponent != null) + propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ConferencePropertiesEditionPartForm.this, ConferenceViewsRepository.Conference_.Properties.overview, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, overview.getText())); + } + }); + overview.addKeyListener(new KeyAdapter() { + /** + * @see org.eclipse.swt.events.KeyAdapter#keyPressed(org.eclipse.swt.events.KeyEvent) + * + */ + @Override + @SuppressWarnings("synthetic-access") + public void keyPressed(KeyEvent e) { + if (e.character == SWT.CR) { + if (propertiesEditionComponent != null) + propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ConferencePropertiesEditionPartForm.this, ConferenceViewsRepository.Conference_.Properties.overview, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, overview.getText())); + } + } + }); + EditingUtils.setID(overview, ConferenceViewsRepository.Conference_.Properties.overview); + EditingUtils.setEEFtype(overview, "eef::Text"); //$NON-NLS-1$ + FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Conference_.Properties.overview, ConferenceViewsRepository.FORM_KIND), null); //$NON-NLS-1$ + return parent; + } + + /** + * + */ protected Composite createLocalisationGroup(FormToolkit widgetFactory, final Composite parent) { Section localisationSection = widgetFactory.createSection(parent, Section.TITLE_BAR | Section.TWISTIE | Section.EXPANDED); localisationSection.setText(ConferenceMessages.ConferencePropertiesEditionPart_LocalisationGroupLabel); @@ -206,6 +320,15 @@ public class ConferencePropertiesEditionPartForm extends CompositePropertiesEdit }); this.sites.setHelpText(propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Conference_.Localisation.sites, ConferenceViewsRepository.FORM_KIND)); this.sites.createControls(parent, widgetFactory); + this.sites.addSelectionListener(new SelectionAdapter() { + + public void widgetSelected(SelectionEvent e) { + if (e.item != null && e.item.getData() instanceof EObject) { + propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ConferencePropertiesEditionPartForm.this, ConferenceViewsRepository.Conference_.Localisation.sites, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SELECTION_CHANGED, null, e.item.getData())); + } + } + + }); GridData sitesData = new GridData(GridData.FILL_HORIZONTAL); sitesData.horizontalSpan = 3; this.sites.setLayoutData(sitesData); @@ -233,6 +356,56 @@ public class ConferencePropertiesEditionPartForm extends CompositePropertiesEdit /** * {@inheritDoc} * + * @see org.eclipse.emf.samples.conference.parts.ConferencePropertiesEditionPart#getName() + * + */ + public String getName() { + return name.getText(); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.samples.conference.parts.ConferencePropertiesEditionPart#setName(String newValue) + * + */ + public void setName(String newValue) { + if (newValue != null) { + name.setText(newValue); + } else { + name.setText(""); //$NON-NLS-1$ + } + } + + + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.samples.conference.parts.ConferencePropertiesEditionPart#getOverview() + * + */ + public String getOverview() { + return overview.getText(); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.samples.conference.parts.ConferencePropertiesEditionPart#setOverview(String newValue) + * + */ + public void setOverview(String newValue) { + if (newValue != null) { + overview.setText(newValue); + } else { + overview.setText(""); //$NON-NLS-1$ + } + } + + + /** + * {@inheritDoc} + * * @see org.eclipse.emf.samples.conference.parts.ConferencePropertiesEditionPart#getPlace() * */ diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/PresencePropertiesEditionPartForm.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/PresencePropertiesEditionPartForm.java index 9a9381680..a9ee9f9b8 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/PresencePropertiesEditionPartForm.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/PresencePropertiesEditionPartForm.java @@ -37,6 +37,8 @@ import org.eclipse.emf.samples.conference.parts.PresencePropertiesEditionPart; import org.eclipse.emf.samples.conference.providers.ConferenceMessages; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ViewerFilter; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -145,6 +147,15 @@ public class PresencePropertiesEditionPartForm extends CompositePropertiesEditio }); this.assists.setHelpText(propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Presence.Talks.assists, ConferenceViewsRepository.FORM_KIND)); this.assists.createControls(parent, widgetFactory); + this.assists.addSelectionListener(new SelectionAdapter() { + + public void widgetSelected(SelectionEvent e) { + if (e.item != null && e.item.getData() instanceof EObject) { + propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(PresencePropertiesEditionPartForm.this, ConferenceViewsRepository.Presence.Talks.assists, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SELECTION_CHANGED, null, e.item.getData())); + } + } + + }); GridData assistsData = new GridData(GridData.FILL_HORIZONTAL); assistsData.horizontalSpan = 3; this.assists.setLayoutData(assistsData); diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TopicPropertiesEditionPartForm.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TopicPropertiesEditionPartForm.java index a7e602304..b9713effe 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TopicPropertiesEditionPartForm.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/forms/TopicPropertiesEditionPartForm.java @@ -218,7 +218,7 @@ public class TopicPropertiesEditionPartForm extends CompositePropertiesEditionPa referencesList = new BasicEList(); } references.setText(referencesList.toString()); - propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TopicPropertiesEditionPartForm.this, ConferenceViewsRepository.Topic.Properties.references, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, referencesList)); + propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TopicPropertiesEditionPartForm.this, ConferenceViewsRepository.Topic.Properties.references, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, new BasicEList(referencesList))); setHasChanged(true); } } diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/ConferencePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/ConferencePropertiesEditionPartImpl.java index 62d4dcdcf..82e21e6e7 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/ConferencePropertiesEditionPartImpl.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/ConferencePropertiesEditionPartImpl.java @@ -40,6 +40,8 @@ import org.eclipse.swt.events.FocusAdapter; import org.eclipse.swt.events.FocusEvent; import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -54,6 +56,8 @@ import org.eclipse.swt.widgets.Text; */ public class ConferencePropertiesEditionPartImpl extends CompositePropertiesEditionPart implements ISWTPropertiesEditionPart, ConferencePropertiesEditionPart { + protected Text name; + protected Text overview; protected Text place; protected ReferencesTable sites; protected List<ViewerFilter> sitesBusinessFilters = new ArrayList<ViewerFilter>(); @@ -95,6 +99,10 @@ protected List<ViewerFilter> sitesFilters = new ArrayList<ViewerFilter>(); */ public void createControls(Composite view) { CompositionSequence conference_Step = new CompositionSequence(); + CompositionStep propertiesStep = conference_Step.addStep(ConferenceViewsRepository.Conference_.Properties.class); + propertiesStep.addStep(ConferenceViewsRepository.Conference_.Properties.name); + propertiesStep.addStep(ConferenceViewsRepository.Conference_.Properties.overview); + CompositionStep localisationStep = conference_Step.addStep(ConferenceViewsRepository.Conference_.Localisation.class); localisationStep.addStep(ConferenceViewsRepository.Conference_.Localisation.place); localisationStep.addStep(ConferenceViewsRepository.Conference_.Localisation.sites); @@ -104,6 +112,15 @@ protected List<ViewerFilter> sitesFilters = new ArrayList<ViewerFilter>(); @Override public Composite addToPart(Composite parent, Object key) { + if (key == ConferenceViewsRepository.Conference_.Properties.class) { + return createPropertiesGroup(parent); + } + if (key == ConferenceViewsRepository.Conference_.Properties.name) { + return createNameText(parent); + } + if (key == ConferenceViewsRepository.Conference_.Properties.overview) { + return createOverviewText(parent); + } if (key == ConferenceViewsRepository.Conference_.Localisation.class) { return createLocalisationGroup(parent); } @@ -122,6 +139,113 @@ protected List<ViewerFilter> sitesFilters = new ArrayList<ViewerFilter>(); /** * */ + protected Composite createPropertiesGroup(Composite parent) { + Group propertiesGroup = new Group(parent, SWT.NONE); + propertiesGroup.setText(ConferenceMessages.ConferencePropertiesEditionPart_PropertiesGroupLabel); + GridData propertiesGroupData = new GridData(GridData.FILL_HORIZONTAL); + propertiesGroupData.horizontalSpan = 3; + propertiesGroup.setLayoutData(propertiesGroupData); + GridLayout propertiesGroupLayout = new GridLayout(); + propertiesGroupLayout.numColumns = 3; + propertiesGroup.setLayout(propertiesGroupLayout); + return propertiesGroup; + } + + + protected Composite createNameText(Composite parent) { + SWTUtils.createPartLabel(parent, ConferenceMessages.ConferencePropertiesEditionPart_NameLabel, propertiesEditionComponent.isRequired(ConferenceViewsRepository.Conference_.Properties.name, ConferenceViewsRepository.SWT_KIND)); + name = new Text(parent, SWT.BORDER); + GridData nameData = new GridData(GridData.FILL_HORIZONTAL); + name.setLayoutData(nameData); + name.addFocusListener(new FocusAdapter() { + + /** + * {@inheritDoc} + * + * @see org.eclipse.swt.events.FocusAdapter#focusLost(org.eclipse.swt.events.FocusEvent) + * + */ + @Override + @SuppressWarnings("synthetic-access") + public void focusLost(FocusEvent e) { + if (propertiesEditionComponent != null) + propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ConferencePropertiesEditionPartImpl.this, ConferenceViewsRepository.Conference_.Properties.name, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, name.getText())); + } + + }); + name.addKeyListener(new KeyAdapter() { + + /** + * {@inheritDoc} + * + * @see org.eclipse.swt.events.KeyAdapter#keyPressed(org.eclipse.swt.events.KeyEvent) + * + */ + @Override + @SuppressWarnings("synthetic-access") + public void keyPressed(KeyEvent e) { + if (e.character == SWT.CR) { + if (propertiesEditionComponent != null) + propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ConferencePropertiesEditionPartImpl.this, ConferenceViewsRepository.Conference_.Properties.name, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, name.getText())); + } + } + + }); + EditingUtils.setID(name, ConferenceViewsRepository.Conference_.Properties.name); + EditingUtils.setEEFtype(name, "eef::Text"); //$NON-NLS-1$ + SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Conference_.Properties.name, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$ + return parent; + } + + + protected Composite createOverviewText(Composite parent) { + SWTUtils.createPartLabel(parent, ConferenceMessages.ConferencePropertiesEditionPart_OverviewLabel, propertiesEditionComponent.isRequired(ConferenceViewsRepository.Conference_.Properties.overview, ConferenceViewsRepository.SWT_KIND)); + overview = new Text(parent, SWT.BORDER); + GridData overviewData = new GridData(GridData.FILL_HORIZONTAL); + overview.setLayoutData(overviewData); + overview.addFocusListener(new FocusAdapter() { + + /** + * {@inheritDoc} + * + * @see org.eclipse.swt.events.FocusAdapter#focusLost(org.eclipse.swt.events.FocusEvent) + * + */ + @Override + @SuppressWarnings("synthetic-access") + public void focusLost(FocusEvent e) { + if (propertiesEditionComponent != null) + propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ConferencePropertiesEditionPartImpl.this, ConferenceViewsRepository.Conference_.Properties.overview, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, overview.getText())); + } + + }); + overview.addKeyListener(new KeyAdapter() { + + /** + * {@inheritDoc} + * + * @see org.eclipse.swt.events.KeyAdapter#keyPressed(org.eclipse.swt.events.KeyEvent) + * + */ + @Override + @SuppressWarnings("synthetic-access") + public void keyPressed(KeyEvent e) { + if (e.character == SWT.CR) { + if (propertiesEditionComponent != null) + propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ConferencePropertiesEditionPartImpl.this, ConferenceViewsRepository.Conference_.Properties.overview, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, overview.getText())); + } + } + + }); + EditingUtils.setID(overview, ConferenceViewsRepository.Conference_.Properties.overview); + EditingUtils.setEEFtype(overview, "eef::Text"); //$NON-NLS-1$ + SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Conference_.Properties.overview, ConferenceViewsRepository.SWT_KIND), null); //$NON-NLS-1$ + return parent; + } + + /** + * + */ protected Composite createLocalisationGroup(Composite parent) { Group localisationGroup = new Group(parent, SWT.NONE); localisationGroup.setText(ConferenceMessages.ConferencePropertiesEditionPart_LocalisationGroupLabel); @@ -206,6 +330,15 @@ protected List<ViewerFilter> sitesFilters = new ArrayList<ViewerFilter>(); }); this.sites.setHelpText(propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Conference_.Localisation.sites, ConferenceViewsRepository.SWT_KIND)); this.sites.createControls(parent); + this.sites.addSelectionListener(new SelectionAdapter() { + + public void widgetSelected(SelectionEvent e) { + if (e.item != null && e.item.getData() instanceof EObject) { + propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ConferencePropertiesEditionPartImpl.this, ConferenceViewsRepository.Conference_.Localisation.sites, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SELECTION_CHANGED, null, e.item.getData())); + } + } + + }); GridData sitesData = new GridData(GridData.FILL_HORIZONTAL); sitesData.horizontalSpan = 3; this.sites.setLayoutData(sitesData); @@ -233,6 +366,56 @@ protected List<ViewerFilter> sitesFilters = new ArrayList<ViewerFilter>(); /** * {@inheritDoc} * + * @see org.eclipse.emf.samples.conference.parts.ConferencePropertiesEditionPart#getName() + * + */ + public String getName() { + return name.getText(); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.samples.conference.parts.ConferencePropertiesEditionPart#setName(String newValue) + * + */ + public void setName(String newValue) { + if (newValue != null) { + name.setText(newValue); + } else { + name.setText(""); //$NON-NLS-1$ + } + } + + + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.samples.conference.parts.ConferencePropertiesEditionPart#getOverview() + * + */ + public String getOverview() { + return overview.getText(); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.samples.conference.parts.ConferencePropertiesEditionPart#setOverview(String newValue) + * + */ + public void setOverview(String newValue) { + if (newValue != null) { + overview.setText(newValue); + } else { + overview.setText(""); //$NON-NLS-1$ + } + } + + + /** + * {@inheritDoc} + * * @see org.eclipse.emf.samples.conference.parts.ConferencePropertiesEditionPart#getPlace() * */ diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/PresencePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/PresencePropertiesEditionPartImpl.java index 4ac2b7159..2d801328f 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/PresencePropertiesEditionPartImpl.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/PresencePropertiesEditionPartImpl.java @@ -38,6 +38,8 @@ import org.eclipse.emf.samples.conference.providers.ConferenceMessages; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -140,6 +142,15 @@ public class PresencePropertiesEditionPartImpl extends CompositePropertiesEditio }); this.assists.setHelpText(propertiesEditionComponent.getHelpContent(ConferenceViewsRepository.Presence.Talks.assists, ConferenceViewsRepository.SWT_KIND)); this.assists.createControls(parent); + this.assists.addSelectionListener(new SelectionAdapter() { + + public void widgetSelected(SelectionEvent e) { + if (e.item != null && e.item.getData() instanceof EObject) { + propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(PresencePropertiesEditionPartImpl.this, ConferenceViewsRepository.Presence.Talks.assists, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SELECTION_CHANGED, null, e.item.getData())); + } + } + + }); GridData assistsData = new GridData(GridData.FILL_HORIZONTAL); assistsData.horizontalSpan = 3; this.assists.setLayoutData(assistsData); diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TopicPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TopicPropertiesEditionPartImpl.java index f03178d33..6ac7f6e5c 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TopicPropertiesEditionPartImpl.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/parts/impl/TopicPropertiesEditionPartImpl.java @@ -215,7 +215,7 @@ public class TopicPropertiesEditionPartImpl extends CompositePropertiesEditionPa referencesList = new BasicEList(); } references.setText(referencesList.toString()); - propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TopicPropertiesEditionPartImpl.this, ConferenceViewsRepository.Topic.Properties.references, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, referencesList)); + propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TopicPropertiesEditionPartImpl.this, ConferenceViewsRepository.Topic.Properties.references, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, new BasicEList(referencesList))); setHasChanged(true); } } diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/provider/ConferenceItemProvider.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/provider/ConferenceItemProvider.java index ade20e37b..528446fe3 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/provider/ConferenceItemProvider.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/provider/ConferenceItemProvider.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ConferenceItemProvider.java,v 1.3 2010/03/17 13:47:34 glefur Exp $ + * $Id: ConferenceItemProvider.java,v 1.4 2011/01/01 23:10:26 glefur Exp $ */ package org.eclipse.emf.samples.conference.provider; @@ -64,6 +64,8 @@ public class ConferenceItemProvider super.getPropertyDescriptors(object); addPlacePropertyDescriptor(object); + addNamePropertyDescriptor(object); + addOverviewPropertyDescriptor(object); } return itemPropertyDescriptors; } @@ -91,6 +93,50 @@ public class ConferenceItemProvider } /** + * This adds a property descriptor for the Name feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addNamePropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Conference_name_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Conference_name_feature", "_UI_Conference_type"), + ConferencePackage.Literals.CONFERENCE__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the Overview feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addOverviewPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Conference_overview_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Conference_overview_feature", "_UI_Conference_type"), + ConferencePackage.Literals.CONFERENCE__OVERVIEW, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. @@ -142,7 +188,7 @@ public class ConferenceItemProvider */ @Override public String getText(Object object) { - String label = ((Conference)object).getPlace(); + String label = ((Conference)object).getName(); return label == null || label.length() == 0 ? getString("_UI_Conference_type") : getString("_UI_Conference_type") + " " + label; @@ -161,6 +207,8 @@ public class ConferenceItemProvider switch (notification.getFeatureID(Conference.class)) { case ConferencePackage.CONFERENCE__PLACE: + case ConferencePackage.CONFERENCE__NAME: + case ConferencePackage.CONFERENCE__OVERVIEW: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; case ConferencePackage.CONFERENCE__PARTICIPANTS: diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/ConferenceEEFAdapterFactory.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/ConferenceEEFAdapterFactory.java index 2bd51dfe2..7e3733c3c 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/ConferenceEEFAdapterFactory.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/ConferenceEEFAdapterFactory.java @@ -22,6 +22,14 @@ public class ConferenceEEFAdapterFactory extends ConferenceAdapterFactory { /** * {@inheritDoc} + * @see org.eclipse.emf.samples.conference.util.ConferenceAdapterFactory#createTopicAdapter() + * + */ + public Adapter createTopicAdapter() { + return new TopicPropertiesEditionProvider(); + } + /** + * {@inheritDoc} * @see org.eclipse.emf.samples.conference.util.ConferenceAdapterFactory#createSiteAdapter() * */ @@ -30,11 +38,11 @@ public class ConferenceEEFAdapterFactory extends ConferenceAdapterFactory { } /** * {@inheritDoc} - * @see org.eclipse.emf.samples.conference.util.ConferenceAdapterFactory#createTalkAdapter() + * @see org.eclipse.emf.samples.conference.util.ConferenceAdapterFactory#createConferenceAdapter() * */ - public Adapter createTalkAdapter() { - return new TalkPropertiesEditionProvider(); + public Adapter createConferenceAdapter() { + return new ConferencePropertiesEditionProvider(); } /** * {@inheritDoc} @@ -46,19 +54,11 @@ public class ConferenceEEFAdapterFactory extends ConferenceAdapterFactory { } /** * {@inheritDoc} - * @see org.eclipse.emf.samples.conference.util.ConferenceAdapterFactory#createTopicAdapter() - * - */ - public Adapter createTopicAdapter() { - return new TopicPropertiesEditionProvider(); - } - /** - * {@inheritDoc} - * @see org.eclipse.emf.samples.conference.util.ConferenceAdapterFactory#createConferenceAdapter() + * @see org.eclipse.emf.samples.conference.util.ConferenceAdapterFactory#createTalkAdapter() * */ - public Adapter createConferenceAdapter() { - return new ConferencePropertiesEditionProvider(); + public Adapter createTalkAdapter() { + return new TalkPropertiesEditionProvider(); } } diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/ConferenceMessages.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/ConferenceMessages.java index 70a071fb9..f5eeac0f1 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/ConferenceMessages.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/ConferenceMessages.java @@ -21,6 +21,9 @@ public class ConferenceMessages extends NLS { private static final String BUNDLE_NAME = "org.eclipse.emf.samples.conference.providers.conferenceMessages"; //$NON-NLS-1$ + public static String ConferencePropertiesEditionPart_PropertiesGroupLabel; + + public static String ConferencePropertiesEditionPart_LocalisationGroupLabel; @@ -78,6 +81,12 @@ public class ConferenceMessages extends NLS { public static String Site_Part_Title; + public static String ConferencePropertiesEditionPart_NameLabel; + + + public static String ConferencePropertiesEditionPart_OverviewLabel; + + public static String ConferencePropertiesEditionPart_PlaceLabel; diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/conferenceMessages.properties b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/conferenceMessages.properties index 8d5f63cbb..6d1dec40d 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/conferenceMessages.properties +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/conferenceMessages.properties @@ -14,6 +14,7 @@ # End of user code # default values ... +ConferencePropertiesEditionPart_PropertiesGroupLabel=Properties ConferencePropertiesEditionPart_LocalisationGroupLabel=Localisation PersonPropertiesEditionPart_IdentityGroupLabel=Identity PersonPropertiesEditionPart_EclipseStatusGroupLabel=Eclipse Status @@ -33,6 +34,8 @@ Topic_ReadOnly=This property is read only Topic_Part_Title=Base Site_ReadOnly=This property is read only Site_Part_Title=Base +ConferencePropertiesEditionPart_NameLabel=Name : +ConferencePropertiesEditionPart_OverviewLabel=Overview : ConferencePropertiesEditionPart_PlaceLabel=Place : ConferencePropertiesEditionPart_SitesLabel=Sites : PersonPropertiesEditionPart_FirstnameLabel=Firstname : diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/conferenceMessages_fr.properties b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/conferenceMessages_fr.properties index 0bbcffe72..a1ead938a 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/conferenceMessages_fr.properties +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/conferenceMessages_fr.properties @@ -14,6 +14,7 @@ # End of user code # default values ... +ConferencePropertiesEditionPart_PropertiesGroupLabel=Properties ConferencePropertiesEditionPart_LocalisationGroupLabel=Localisation PersonPropertiesEditionPart_IdentityGroupLabel=Identity PersonPropertiesEditionPart_EclipseStatusGroupLabel=Eclipse Status @@ -33,6 +34,8 @@ Topic_ReadOnly=Cette propri\u00E9t\u00E9 est en lecture seule Topic_Part_Title=Base Site_ReadOnly=Cette propri\u00E9t\u00E9 est en lecture seule Site_Part_Title=Base +ConferencePropertiesEditionPart_NameLabel=Name : +ConferencePropertiesEditionPart_OverviewLabel=Overview : ConferencePropertiesEditionPart_PlaceLabel=Place : ConferencePropertiesEditionPart_SitesLabel=Sites : PersonPropertiesEditionPart_FirstnameLabel=Firstname : |