diff options
| author | Stéphane Bégaudeau | 2016-08-29 13:38:06 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2016-09-14 14:28:17 +0000 |
| commit | 889a911d5aefff2042ebcd88c4955528d0b9dba8 (patch) | |
| tree | 43d551eb4bf4fc89ac1608ccd2b0c89378382545 | |
| parent | 3217943a9749bc815a105e1e294e6419903f2e77 (diff) | |
| download | org.eclipse.sirius-889a911d5aefff2042ebcd88c4955528d0b9dba8.tar.gz org.eclipse.sirius-889a911d5aefff2042ebcd88c4955528d0b9dba8.tar.xz org.eclipse.sirius-889a911d5aefff2042ebcd88c4955528d0b9dba8.zip | |
[500423] Rename domainClassExpression in iterableExpression
Bug: 500423
Change-Id: I906ee82f3e909c6279bc54cf4f4721915bab1e2a
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
37 files changed, 268 insertions, 174 deletions
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html index e180b17a7b..e4dd070a0c 100644 --- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html +++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html @@ -149,6 +149,11 @@ <code>org.eclipse.sirius.diagram.ui.layoutDataManager</code> is deprecated. It is replaced by the new extension point <code>org.eclipse.sirius.diagram.ui.formatDataManager</code>. The deprecated extension point will be removed in the next 5.0 Sirius major release. Several classes associated with this deprecated extension point are also deprecated (see Developer-Visible Changes for details). </li> + <li><span class="label label-info">Modified</span> The property + <code>Domain Class Expression</code> in + <code>DynamicMappingFor</code> elements (in properties views definitions) has been renamed into + <code>Iterable Expression</code>. + </li> </ul> <h3 id="DeveloperVisibleChanges">Developer-Visible Changes</h3> <ul> @@ -516,7 +521,16 @@ <code>mouseScrollWithKey(int, int, int, int)</code>, has been added in classes <code>org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor</code>, <code>org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusGefViewer</code> and - <code>org.eclipse.sirius.tests.swtbot.support.api.widget.SWTBotSiriusFigureCanvas</code> to allow testing events occurring after a mouse scroll combined to a keyboard key pressed at a given absolute position. + <code>org.eclipse.sirius.tests.swtbot.support.api.widget.SWTBotSiriusFigureCanvas</code> to allow testing events occurring after a mouse scroll combined to a keyboard key pressed at a given absolute position. + </li> + </ul> + <h4 id="Changesinorg.eclipse.sirius.properties">Changes in + <code>org.eclipse.sirius.properties</code> + </h4> + <ul> + <li><span class="label label-info">Modified</span> The property + <code>domainClassExpression</code> has been renamed into + <code>iterableExpression</code>. </li> </ul> <h4 id="Changesinorg.eclipse.sirius.ecore.extender">Changes in diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile index 68fc281564..68be592183 100644 --- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile +++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile @@ -23,6 +23,7 @@ h3. Specifier-Visible Changes * The rules concerning the layout of compartments have been changed/completed. You can have a look at the "dedicated chapter":specifier/diagrams/Diagrams.html#compartments_layout in the specifier documentation for more details. * The extension point @org.eclipse.sirius.diagram.ui.layoutDataManager@ is deprecated. It is replaced by the new extension point @org.eclipse.sirius.diagram.ui.formatDataManager@. The deprecated extension point will be removed in the next 5.0 Sirius major release. Several classes associated with this deprecated extension point are also deprecated (see Developer-Visible Changes for details). +* <span class="label label-info">Modified</span> The property @Domain Class Expression@ in @DynamicMappingFor@ elements (in properties views definitions) has been renamed into @Iterable Expression@. h3. Developer-Visible Changes @@ -118,7 +119,11 @@ h4. Changes in @org.eclipse.sirius.tests.junit.support@ h4. Changes in @org.eclipse.sirius.tests.swtbot.support@ -* <span class="label label-success">Added</span> The utility method @mouseScrollWithKey(int, int, int, int)@, has been added in classes @org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor@, @org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusGefViewer@ and @org.eclipse.sirius.tests.swtbot.support.api.widget.SWTBotSiriusFigureCanvas@ to allow testing events occurring after a mouse scroll combined to a keyboard key pressed at a given absolute position. +* <span class="label label-success">Added</span> The utility method @mouseScrollWithKey(int, int, int, int)@, has been added in classes @org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor@, @org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusGefViewer@ and @org.eclipse.sirius.tests.swtbot.support.api.widget.SWTBotSiriusFigureCanvas@ to allow testing events occurring after a mouse scroll combined to a keyboard key pressed at a given absolute position. + +h4. Changes in @org.eclipse.sirius.properties@ + +* <span class="label label-info">Modified</span> The property @domainClassExpression@ has been renamed into @iterableExpression@. h4. Changes in @org.eclipse.sirius.ecore.extender@ diff --git a/plugins/org.eclipse.sirius.doc/doc/specifier/properties/Properties_View_Description.html b/plugins/org.eclipse.sirius.doc/doc/specifier/properties/Properties_View_Description.html index f258efbafc..539c4dece0 100644 --- a/plugins/org.eclipse.sirius.doc/doc/specifier/properties/Properties_View_Description.html +++ b/plugins/org.eclipse.sirius.doc/doc/specifier/properties/Properties_View_Description.html @@ -886,15 +886,15 @@ <p>A <em>Dynamic Mapping For</em> can appear directly inside a group description, or inside a <a href="#containers">container</a>, in which case you can specify a specific - <a href="#layout">layout</a>. You must specify a - <em>Domain Class Expression</em> which computes a list of metamodel elements. An + <a href="#layout">layout</a>. You must specify an + <em>Iterable Expression</em> which computes a list of elements. An <em>Iterator</em> must be define to be able to access the different element of the list thanks to a variable. - <br/>Sirius will loop on the metamodel element list to try to apply the + <br/>Sirius will loop on the element list to try to apply the <em>Predicate Expression</em> which should return a boolean and defined in a <em>Dynamic Mapping If</em>. <br/>The <em>Dynamic Mapping If</em> contains - <strong>one widget</strong> which represents all the metamodel elements selected by the previous predicate. + <strong>one widget</strong> which represents all the elements selected by the previous predicate. </p> <p>The dynamic mapping mechanism is the one used by Sirius to provide by default properties view even if you do not specify any <em>Properties View Description</em> in your VSM. @@ -903,7 +903,7 @@ <ul> <li>a <em>Dynamic Mapping For</em> defining as - <em>Domain Class Expression</em> : + <em>Iterable Expression</em> : <code>aql:self.eClass().eAllStructuralFeatures</code> which means get all the structural features available for the current eClass. </li> <li>an diff --git a/plugins/org.eclipse.sirius.doc/doc/specifier/properties/Properties_View_Description.textile b/plugins/org.eclipse.sirius.doc/doc/specifier/properties/Properties_View_Description.textile index e9d0539049..3aa6609939 100644 --- a/plugins/org.eclipse.sirius.doc/doc/specifier/properties/Properties_View_Description.textile +++ b/plugins/org.eclipse.sirius.doc/doc/specifier/properties/Properties_View_Description.textile @@ -385,13 +385,13 @@ h3(#dynamic_mappings). Dynamic mappings A dynamic mapping is used to represent model elements of the same type with the same widget in the properties view. A dynamic mapping can contain widgets. -A _Dynamic Mapping For_ can appear directly inside a group description, or inside a "container":#containers, in which case you can specify a specific "layout":#layout. You must specify a _Domain Class Expression_ which computes a list of metamodel elements. An _Iterator_ must be define to be able to access the different element of the list thanks to a variable. -Sirius will loop on the metamodel element list to try to apply the _Predicate Expression_ which should return a boolean and defined in a _Dynamic Mapping If_. -The _Dynamic Mapping If_ contains *one widget* which represents all the metamodel elements selected by the previous predicate. +A _Dynamic Mapping For_ can appear directly inside a group description, or inside a "container":#containers, in which case you can specify a specific "layout":#layout. You must specify an _Iterable Expression_ which computes a list of elements. An _Iterator_ must be define to be able to access the different element of the list thanks to a variable. +Sirius will loop on the element list to try to apply the _Predicate Expression_ which should return a boolean and defined in a _Dynamic Mapping If_. +The _Dynamic Mapping If_ contains *one widget* which represents all the elements selected by the previous predicate. The dynamic mapping mechanism is the one used by Sirius to provide by default properties view even if you do not specify any _Properties View Description_ in your VSM. If we take one of the default rules implemented by Sirius we have: -* a _Dynamic Mapping For_ defining as _Domain Class Expression_ : @aql:self.eClass().eAllStructuralFeatures@ which means get all the structural features available for the current eClass. +* a _Dynamic Mapping For_ defining as _Iterable Expression_ : @aql:self.eClass().eAllStructuralFeatures@ which means get all the structural features available for the current eClass. * an _Iterator_ set to @eStructuralFeature@. ** a _Dynamic Mapping If_ with the _Predicate Expression_ equals to @aql:eStructuralFeature.eType.instanceTypeName = 'java.lang.String'@ which means that we just keep the structural features serialized as a String. Notice that in the predicate expression we use the variable @eStructuralFeature@ which was defined as the _Iterator_. *** in this case we will represent the structural feature with a _Text widget_ for which we set: diff --git a/plugins/org.eclipse.sirius.editor.properties/plugin.xml b/plugins/org.eclipse.sirius.editor.properties/plugin.xml index eeccc3a5df..a356233750 100644 --- a/plugins/org.eclipse.sirius.editor.properties/plugin.xml +++ b/plugins/org.eclipse.sirius.editor.properties/plugin.xml @@ -331,9 +331,9 @@ <input type="org.eclipse.sirius.properties.DynamicMappingIf"/> </propertySection> <propertySection - class="org.eclipse.sirius.properties.editor.properties.sections.properties.dynamicmappingfor.DynamicMappingForDomainClassExpressionPropertySection" - id="properties.section.dynamicMappingFor.DomainClassExpression" - filter="org.eclipse.sirius.properties.editor.properties.filters.properties.dynamicmappingfor.DynamicMappingForDomainClassExpressionFilter" + class="org.eclipse.sirius.properties.editor.properties.sections.properties.dynamicmappingfor.DynamicMappingForIterableExpressionPropertySection" + id="properties.section.dynamicMappingFor.IterableExpression" + filter="org.eclipse.sirius.properties.editor.properties.filters.properties.dynamicmappingfor.DynamicMappingForIterableExpressionFilter" afterSection="properties.section.dynamicMappingFor.Iterator" tab="viewpoint.tab.general"> <input type="org.eclipse.sirius.properties.DynamicMappingFor"/> diff --git a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionFilter.java b/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingfor/DynamicMappingForIterableExpressionFilter.java index 39d9924709..0e44e3f483 100644 --- a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionFilter.java +++ b/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingfor/DynamicMappingForIterableExpressionFilter.java @@ -18,16 +18,16 @@ import org.eclipse.sirius.properties.PropertiesPackage; // End of user code specific imports /** - * A filter for the domainClassExpression property section. + * A filter for the iterableExpression property section. */ -public class DynamicMappingForDomainClassExpressionFilter extends ViewpointPropertyFilter { +public class DynamicMappingForIterableExpressionFilter extends ViewpointPropertyFilter { /** * {@inheritDoc} */ @Override protected EStructuralFeature getFeature() { - return PropertiesPackage.eINSTANCE.getDynamicMappingFor_DomainClassExpression(); + return PropertiesPackage.eINSTANCE.getDynamicMappingFor_IterableExpression(); } /** diff --git a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionPropertySection.java b/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForIterableExpressionPropertySection.java index e83ec663f9..91f37d2f2d 100644 --- a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionPropertySection.java +++ b/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForIterableExpressionPropertySection.java @@ -25,17 +25,16 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; // End of user code imports /** - * A section for the domainClassExpression property of a DynamicMappingFor - * object. + * A section for the iterableExpression property of a DynamicMappingFor object. */ -public class DynamicMappingForDomainClassExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient { +public class DynamicMappingForIterableExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient { /** * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText() */ @Override protected String getDefaultLabelText() { - return "DomainClassExpression"; //$NON-NLS-1$ + return "IterableExpression"; //$NON-NLS-1$ } /** @@ -56,7 +55,7 @@ public class DynamicMappingForDomainClassExpressionPropertySection extends Abstr */ @Override public EAttribute getFeature() { - return PropertiesPackage.eINSTANCE.getDynamicMappingFor_DomainClassExpression(); + return PropertiesPackage.eINSTANCE.getDynamicMappingFor_IterableExpression(); } /** @@ -101,7 +100,7 @@ public class DynamicMappingForDomainClassExpressionPropertySection extends Abstr return new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), DynamicMappingForDomainClassExpressionPropertySection.this, text.getText()); + TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), DynamicMappingForIterableExpressionPropertySection.this, text.getText()); dialog.open(); text.setText(dialog.getResult()); handleTextModified(); diff --git a/plugins/org.eclipse.sirius.properties.edit/plugin.properties b/plugins/org.eclipse.sirius.properties.edit/plugin.properties index 8b3a59059c..bcffdde981 100644 --- a/plugins/org.eclipse.sirius.properties.edit/plugin.properties +++ b/plugins/org.eclipse.sirius.properties.edit/plugin.properties @@ -55,7 +55,7 @@ _UI_SelectDescription_valueExpression_feature = Value Expression _UI_SelectDescription_initialOperation_feature = Initial Operation _UI_SelectDescription_candidatesExpression_feature = Candidates Expression _UI_SelectDescription_candidateDisplayExpression_feature = Candidate Display Expression -_UI_DynamicMappingFor_domainClassExpression_feature = Domain Class Expression +_UI_DynamicMappingFor_iterableExpression_feature = Iterable Expression _UI_CheckboxDescription_type = Checkbox _UI_CheckboxDescription_valueExpression_feature = Value Expression _UI_CheckboxDescription_initialOperation_feature = Initial Operation @@ -206,3 +206,4 @@ _UI_GroupConditionalStyle_type = Conditional Style _UI_GroupConditionalStyle_style_feature = Style _UI_GroupDescription_conditionalStyles_feature = Conditional Styles _UI_LabelDescription_valueExpression_feature = Value Expression + diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ControlDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ControlDescriptionItemProvider.java index f6b0743a76..0eb6a963c2 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ControlDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ControlDescriptionItemProvider.java @@ -75,8 +75,8 @@ public class ControlDescriptionItemProvider extends ItemProviderAdapter protected void addIdentifierPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ControlDescription_identifier_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ControlDescription_identifier_feature", "_UI_ControlDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.CONTROL_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_ControlDescription_identifier_feature", "_UI_ControlDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.CONTROL_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -89,7 +89,7 @@ public class ControlDescriptionItemProvider extends ItemProviderAdapter public String getText(Object object) { String label = ((ControlDescription) object).getIdentifier(); return label == null || label.length() == 0 ? getString("_UI_ControlDescription_type") : //$NON-NLS-1$ - getString("_UI_ControlDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_ControlDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java index 38dee5216c..1e2a919a48 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java @@ -76,8 +76,8 @@ public class CustomExpressionItemProvider extends ItemProviderAdapter protected void addIdentifierPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_CustomExpression_identifier_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_CustomExpression_identifier_feature", "_UI_CustomExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.CUSTOM_EXPRESSION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_CustomExpression_identifier_feature", "_UI_CustomExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.CUSTOM_EXPRESSION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -89,8 +89,8 @@ public class CustomExpressionItemProvider extends ItemProviderAdapter protected void addCustomExpressionPropertyDescriptor(Object object) { itemPropertyDescriptors.add( createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_CustomExpression_customExpression_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_CustomExpression_customExpression_feature", "_UI_CustomExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.CUSTOM_EXPRESSION__CUSTOM_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_CustomExpression_customExpression_feature", "_UI_CustomExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.CUSTOM_EXPRESSION__CUSTOM_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -114,7 +114,7 @@ public class CustomExpressionItemProvider extends ItemProviderAdapter public String getText(Object object) { String label = ((CustomExpression) object).getIdentifier(); return label == null || label.length() == 0 ? getString("_UI_CustomExpression_type") : //$NON-NLS-1$ - getString("_UI_CustomExpression_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_CustomExpression_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java index 008759706f..13f374ff96 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java @@ -77,8 +77,8 @@ public class CustomOperationItemProvider extends ItemProviderAdapter protected void addIdentifierPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_CustomOperation_identifier_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_CustomOperation_identifier_feature", "_UI_CustomOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.CUSTOM_OPERATION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_CustomOperation_identifier_feature", "_UI_CustomOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.CUSTOM_OPERATION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -135,7 +135,7 @@ public class CustomOperationItemProvider extends ItemProviderAdapter public String getText(Object object) { String label = ((CustomOperation) object).getIdentifier(); return label == null || label.length() == 0 ? getString("_UI_CustomOperation_type") : //$NON-NLS-1$ - getString("_UI_CustomOperation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_CustomOperation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java index 71085113bb..6f3929c1d8 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java @@ -55,7 +55,7 @@ public class DynamicMappingForItemProvider extends ControlDescriptionItemProvide super.getPropertyDescriptors(object); addIteratorPropertyDescriptor(object); - addDomainClassExpressionPropertyDescriptor(object); + addIterableExpressionPropertyDescriptor(object); } return itemPropertyDescriptors; } @@ -74,16 +74,16 @@ public class DynamicMappingForItemProvider extends ControlDescriptionItemProvide } /** - * This adds a property descriptor for the Domain Class Expression feature. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * This adds a property descriptor for the Iterable Expression feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ - protected void addDomainClassExpressionPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_DynamicMappingFor_domainClassExpression_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_DynamicMappingFor_domainClassExpression_feature", "_UI_DynamicMappingFor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + protected void addIterableExpressionPropertyDescriptor(Object object) { + itemPropertyDescriptors.add( + createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DynamicMappingFor_iterableExpression_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_DynamicMappingFor_iterableExpression_feature", "_UI_DynamicMappingFor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.DYNAMIC_MAPPING_FOR__ITERABLE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -157,7 +157,7 @@ public class DynamicMappingForItemProvider extends ControlDescriptionItemProvide switch (notification.getFeatureID(DynamicMappingFor.class)) { case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR: - case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION: + case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERABLE_EXPRESSION: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; case PropertiesPackage.DYNAMIC_MAPPING_FOR__IFS: diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java index a342a1a530..118b5edd1c 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java @@ -77,8 +77,8 @@ public class DynamicMappingIfItemProvider extends ItemProviderAdapter protected void addPredicateExpressionPropertyDescriptor(Object object) { itemPropertyDescriptors.add( createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DynamicMappingIf_predicateExpression_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_DynamicMappingIf_predicateExpression_feature", "_UI_DynamicMappingIf_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.DYNAMIC_MAPPING_IF__PREDICATE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_DynamicMappingIf_predicateExpression_feature", "_UI_DynamicMappingIf_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.DYNAMIC_MAPPING_IF__PREDICATE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -135,7 +135,7 @@ public class DynamicMappingIfItemProvider extends ItemProviderAdapter public String getText(Object object) { String label = ((DynamicMappingIf) object).getPredicateExpression(); return label == null || label.length() == 0 ? getString("_UI_DynamicMappingIf_type") : //$NON-NLS-1$ - getString("_UI_DynamicMappingIf_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_DynamicMappingIf_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java index 4b58068691..f9af1a70b5 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java @@ -83,8 +83,8 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter protected void addIdentifierPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GroupDescription_identifier_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_identifier_feature", "_UI_GroupDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.GROUP_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_identifier_feature", "_UI_GroupDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.GROUP_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -96,8 +96,8 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter protected void addLabelExpressionPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GroupDescription_labelExpression_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_labelExpression_feature", "_UI_GroupDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.GROUP_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_labelExpression_feature", "_UI_GroupDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.GROUP_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -109,8 +109,8 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter protected void addDomainClassPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GroupDescription_domainClass_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_domainClass_feature", "_UI_GroupDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.GROUP_DESCRIPTION__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_domainClass_feature", "_UI_GroupDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.GROUP_DESCRIPTION__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -196,7 +196,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter public String getText(Object object) { String label = ((GroupDescription) object).getIdentifier(); return label == null || label.length() == 0 ? getString("_UI_GroupDescription_type") : //$NON-NLS-1$ - getString("_UI_GroupDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_GroupDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupStyleItemProvider.java index 9fc361d340..cb12f27c0f 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupStyleItemProvider.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupStyleItemProvider.java @@ -81,8 +81,8 @@ public class GroupStyleItemProvider extends ItemProviderAdapter protected void addBackgroundColorPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GroupStyle_backgroundColor_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_GroupStyle_backgroundColor_feature", "_UI_GroupStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.GROUP_STYLE__BACKGROUND_COLOR, true, false, true, null, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_GroupStyle_backgroundColor_feature", "_UI_GroupStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.GROUP_STYLE__BACKGROUND_COLOR, true, false, true, null, null, null)); } /** @@ -94,8 +94,8 @@ public class GroupStyleItemProvider extends ItemProviderAdapter protected void addForegroundColorPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GroupStyle_foregroundColor_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_GroupStyle_foregroundColor_feature", "_UI_GroupStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.GROUP_STYLE__FOREGROUND_COLOR, true, false, true, null, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_GroupStyle_foregroundColor_feature", "_UI_GroupStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.GROUP_STYLE__FOREGROUND_COLOR, true, false, true, null, null, null)); } /** @@ -107,8 +107,8 @@ public class GroupStyleItemProvider extends ItemProviderAdapter protected void addFontNameExpressionPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GroupStyle_fontNameExpression_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_GroupStyle_fontNameExpression_feature", "_UI_GroupStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.GROUP_STYLE__FONT_NAME_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_GroupStyle_fontNameExpression_feature", "_UI_GroupStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.GROUP_STYLE__FONT_NAME_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -120,8 +120,8 @@ public class GroupStyleItemProvider extends ItemProviderAdapter protected void addFontSizePropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GroupStyle_fontSize_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_GroupStyle_fontSize_feature", "_UI_GroupStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.GROUP_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_GroupStyle_fontSize_feature", "_UI_GroupStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.GROUP_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } /** @@ -133,8 +133,8 @@ public class GroupStyleItemProvider extends ItemProviderAdapter protected void addBarStylePropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GroupStyle_barStyle_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_GroupStyle_barStyle_feature", "_UI_GroupStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.GROUP_STYLE__BAR_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_GroupStyle_barStyle_feature", "_UI_GroupStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.GROUP_STYLE__BAR_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -146,8 +146,8 @@ public class GroupStyleItemProvider extends ItemProviderAdapter protected void addToggleStylePropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GroupStyle_toggleStyle_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_GroupStyle_toggleStyle_feature", "_UI_GroupStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.GROUP_STYLE__TOGGLE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_GroupStyle_toggleStyle_feature", "_UI_GroupStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.GROUP_STYLE__TOGGLE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -159,8 +159,8 @@ public class GroupStyleItemProvider extends ItemProviderAdapter protected void addExpandedByDefaultPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GroupStyle_expandedByDefault_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_GroupStyle_expandedByDefault_feature", "_UI_GroupStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.GROUP_STYLE__EXPANDED_BY_DEFAULT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_GroupStyle_expandedByDefault_feature", "_UI_GroupStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.GROUP_STYLE__EXPANDED_BY_DEFAULT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } /** @@ -184,7 +184,7 @@ public class GroupStyleItemProvider extends ItemProviderAdapter public String getText(Object object) { String label = ((GroupStyle) object).getFontNameExpression(); return label == null || label.length() == 0 ? getString("_UI_GroupStyle_type") : //$NON-NLS-1$ - getString("_UI_GroupStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_GroupStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java index 27237d6d17..a7ae1d04b1 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java @@ -155,10 +155,10 @@ public class GroupValidationSetDescriptionItemProvider extends ItemProviderAdapt super.collectNewChildDescriptors(newChildDescriptors, object); newChildDescriptors - .add(createChildParameter(PropertiesPackage.Literals.GROUP_VALIDATION_SET_DESCRIPTION__SEMANTIC_VALIDATION_RULES, ValidationFactory.eINSTANCE.createSemanticValidationRule())); + .add(createChildParameter(PropertiesPackage.Literals.GROUP_VALIDATION_SET_DESCRIPTION__SEMANTIC_VALIDATION_RULES, ValidationFactory.eINSTANCE.createSemanticValidationRule())); newChildDescriptors - .add(createChildParameter(PropertiesPackage.Literals.GROUP_VALIDATION_SET_DESCRIPTION__PROPERTY_VALIDATION_RULES, PropertiesFactory.eINSTANCE.createPropertyValidationRule())); + .add(createChildParameter(PropertiesPackage.Literals.GROUP_VALIDATION_SET_DESCRIPTION__PROPERTY_VALIDATION_RULES, PropertiesFactory.eINSTANCE.createPropertyValidationRule())); } /** diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java index db6b16c6f4..a9978973df 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java @@ -82,8 +82,8 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter protected void addIdentifierPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PageDescription_identifier_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_identifier_feature", "_UI_PageDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.PAGE_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_identifier_feature", "_UI_PageDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.PAGE_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -95,8 +95,8 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter protected void addLabelExpressionPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PageDescription_labelExpression_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_labelExpression_feature", "_UI_PageDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.PAGE_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_labelExpression_feature", "_UI_PageDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.PAGE_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -108,8 +108,8 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter protected void addDomainClassPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PageDescription_domainClass_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_domainClass_feature", "_UI_PageDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.PAGE_DESCRIPTION__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_domainClass_feature", "_UI_PageDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.PAGE_DESCRIPTION__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -147,8 +147,8 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter protected void addGroupsPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PageDescription_groups_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_groups_feature", "_UI_PageDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.PAGE_DESCRIPTION__GROUPS, true, false, true, null, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_groups_feature", "_UI_PageDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.PAGE_DESCRIPTION__GROUPS, true, false, true, null, null, null)); } /** @@ -205,7 +205,7 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter public String getText(Object object) { String label = ((PageDescription) object).getIdentifier(); return label == null || label.length() == 0 ? getString("_UI_PageDescription_type") : //$NON-NLS-1$ - getString("_UI_PageDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_PageDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java index d6434c4d40..60d5646534 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java @@ -152,7 +152,7 @@ public class PageValidationSetDescriptionItemProvider extends ItemProviderAdapte super.collectNewChildDescriptors(newChildDescriptors, object); newChildDescriptors - .add(createChildParameter(PropertiesPackage.Literals.PAGE_VALIDATION_SET_DESCRIPTION__SEMANTIC_VALIDATION_RULES, ValidationFactory.eINSTANCE.createSemanticValidationRule())); + .add(createChildParameter(PropertiesPackage.Literals.PAGE_VALIDATION_SET_DESCRIPTION__SEMANTIC_VALIDATION_RULES, ValidationFactory.eINSTANCE.createSemanticValidationRule())); } /** diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java index df74d77dd0..fc75d830a8 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java @@ -79,7 +79,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto /** * This helps manage the child creation extenders. <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(PropertiesEditPlugin.INSTANCE, PropertiesPackage.eNS_URI); @@ -1319,7 +1319,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public List<IChildCreationExtender> getChildCreationExtenders() { @@ -1328,7 +1328,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ @Override @@ -1338,7 +1338,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ @Override diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java index fa638eb56e..7552ff9c14 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java @@ -65,8 +65,8 @@ public class PropertyValidationRuleItemProvider extends ValidationRuleItemProvid protected void addTargetsPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PropertyValidationRule_targets_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_PropertyValidationRule_targets_feature", "_UI_PropertyValidationRule_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.PROPERTY_VALIDATION_RULE__TARGETS, true, false, true, null, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_PropertyValidationRule_targets_feature", "_UI_PropertyValidationRule_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.PROPERTY_VALIDATION_RULE__TARGETS, true, false, true, null, null, null)); } /** @@ -90,7 +90,7 @@ public class PropertyValidationRuleItemProvider extends ValidationRuleItemProvid public String getText(Object object) { String label = ((PropertyValidationRule) object).getName(); return label == null || label.length() == 0 ? getString("_UI_PropertyValidationRule_type") : //$NON-NLS-1$ - getString("_UI_PropertyValidationRule_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_PropertyValidationRule_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java index c84cc5d6b7..e5f33ffc16 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java @@ -80,8 +80,8 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter protected void addIdentifierPropertyDescriptor(Object object) { itemPropertyDescriptors.add( createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewExtensionDescription_identifier_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_identifier_feature", "_UI_ViewExtensionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_identifier_feature", "_UI_ViewExtensionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -93,8 +93,8 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter protected void addMetamodelsPropertyDescriptor(Object object) { itemPropertyDescriptors.add( createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewExtensionDescription_metamodels_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_metamodels_feature", "_UI_ViewExtensionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__METAMODELS, true, false, true, null, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_metamodels_feature", "_UI_ViewExtensionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__METAMODELS, true, false, true, null, null, null)); } /** @@ -152,7 +152,7 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter public String getText(Object object) { String label = ((ViewExtensionDescription) object).getIdentifier(); return label == null || label.length() == 0 ? getString("_UI_ViewExtensionDescription_type") : //$NON-NLS-1$ - getString("_UI_ViewExtensionDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_ViewExtensionDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetActionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetActionItemProvider.java index 33336063d9..c4ceff1c9c 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetActionItemProvider.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetActionItemProvider.java @@ -77,8 +77,8 @@ public class WidgetActionItemProvider extends ItemProviderAdapter protected void addLabelExpressionPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_WidgetAction_labelExpression_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_WidgetAction_labelExpression_feature", "_UI_WidgetAction_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.WIDGET_ACTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_WidgetAction_labelExpression_feature", "_UI_WidgetAction_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.WIDGET_ACTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -135,7 +135,7 @@ public class WidgetActionItemProvider extends ItemProviderAdapter public String getText(Object object) { String label = ((WidgetAction) object).getLabelExpression(); return label == null || label.length() == 0 ? getString("_UI_WidgetAction_type") : //$NON-NLS-1$ - getString("_UI_WidgetAction_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_WidgetAction_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetConditionalStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetConditionalStyleItemProvider.java index 017af20c17..703e8bb703 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetConditionalStyleItemProvider.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetConditionalStyleItemProvider.java @@ -89,7 +89,7 @@ public class WidgetConditionalStyleItemProvider extends ItemProviderAdapter public String getText(Object object) { String label = ((WidgetConditionalStyle) object).getPreconditionExpression(); return label == null || label.length() == 0 ? getString("_UI_WidgetConditionalStyle_type") : //$NON-NLS-1$ - getString("_UI_WidgetConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_WidgetConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetStyleItemProvider.java index 07fa9bb813..13c9335581 100644 --- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetStyleItemProvider.java +++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetStyleItemProvider.java @@ -79,8 +79,8 @@ public class WidgetStyleItemProvider extends ItemProviderAdapter protected void addLabelFontNameExpressionPropertyDescriptor(Object object) { itemPropertyDescriptors.add( createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_WidgetStyle_labelFontNameExpression_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_WidgetStyle_labelFontNameExpression_feature", "_UI_WidgetStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_WidgetStyle_labelFontNameExpression_feature", "_UI_WidgetStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -92,8 +92,8 @@ public class WidgetStyleItemProvider extends ItemProviderAdapter protected void addLabelFontSizePropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_WidgetStyle_labelFontSize_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_WidgetStyle_labelFontSize_feature", "_UI_WidgetStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.WIDGET_STYLE__LABEL_FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_WidgetStyle_labelFontSize_feature", "_UI_WidgetStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.WIDGET_STYLE__LABEL_FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } /** @@ -105,8 +105,8 @@ public class WidgetStyleItemProvider extends ItemProviderAdapter protected void addLabelBackgroundColorPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_WidgetStyle_labelBackgroundColor_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_WidgetStyle_labelBackgroundColor_feature", "_UI_WidgetStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.WIDGET_STYLE__LABEL_BACKGROUND_COLOR, true, false, true, null, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_WidgetStyle_labelBackgroundColor_feature", "_UI_WidgetStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.WIDGET_STYLE__LABEL_BACKGROUND_COLOR, true, false, true, null, null, null)); } /** @@ -118,8 +118,8 @@ public class WidgetStyleItemProvider extends ItemProviderAdapter protected void addLabelForegroundColorPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_WidgetStyle_labelForegroundColor_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_WidgetStyle_labelForegroundColor_feature", "_UI_WidgetStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.WIDGET_STYLE__LABEL_FOREGROUND_COLOR, true, false, true, null, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_WidgetStyle_labelForegroundColor_feature", "_UI_WidgetStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.WIDGET_STYLE__LABEL_FOREGROUND_COLOR, true, false, true, null, null, null)); } /** @@ -131,8 +131,8 @@ public class WidgetStyleItemProvider extends ItemProviderAdapter protected void addLabelFontFormatPropertyDescriptor(Object object) { itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_WidgetStyle_labelFontFormat_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_WidgetStyle_labelFontFormat_feature", "_UI_WidgetStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PropertiesPackage.Literals.WIDGET_STYLE__LABEL_FONT_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + getString("_UI_PropertyDescriptor_description", "_UI_WidgetStyle_labelFontFormat_feature", "_UI_WidgetStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PropertiesPackage.Literals.WIDGET_STYLE__LABEL_FONT_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -156,7 +156,7 @@ public class WidgetStyleItemProvider extends ItemProviderAdapter public String getText(Object object) { String label = ((WidgetStyle) object).getLabelFontNameExpression(); return label == null || label.length() == 0 ? getString("_UI_WidgetStyle_type") : //$NON-NLS-1$ - getString("_UI_WidgetStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_WidgetStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius.properties/model/properties.ecore b/plugins/org.eclipse.sirius.properties/model/properties.ecore index f88044148a..a6b245d7d1 100644 --- a/plugins/org.eclipse.sirius.properties/model/properties.ecore +++ b/plugins/org.eclipse.sirius.properties/model/properties.ecore @@ -158,8 +158,8 @@ <eClassifiers xsi:type="ecore:EClass" name="DynamicMappingFor" eSuperTypes="#//ControlDescription"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="iterator" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="domainClassExpression" - lowerBound="1" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="iterableExpression" lowerBound="1" + eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/> <eStructuralFeatures xsi:type="ecore:EReference" name="ifs" lowerBound="1" upperBound="-1" eType="#//DynamicMappingIf" containment="true"/> </eClassifiers> diff --git a/plugins/org.eclipse.sirius.properties/model/properties.genmodel b/plugins/org.eclipse.sirius.properties/model/properties.genmodel index d021fa4799..d4d7626267 100644 --- a/plugins/org.eclipse.sirius.properties/model/properties.genmodel +++ b/plugins/org.eclipse.sirius.properties/model/properties.genmodel @@ -116,7 +116,7 @@ </genClasses> <genClasses ecoreClass="properties.ecore#//DynamicMappingFor"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//DynamicMappingFor/iterator"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//DynamicMappingFor/domainClassExpression"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//DynamicMappingFor/iterableExpression"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//DynamicMappingFor/ifs"/> </genClasses> <genClasses ecoreClass="properties.ecore#//DynamicMappingIf"> diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java index add14cc349..e64b855797 100644 --- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java +++ b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java @@ -24,8 +24,8 @@ import org.eclipse.emf.common.util.EList; * <li>{@link org.eclipse.sirius.properties.DynamicMappingFor#getIterator * <em>Iterator</em>}</li> * <li> - * {@link org.eclipse.sirius.properties.DynamicMappingFor#getDomainClassExpression - * <em>Domain Class Expression</em>}</li> + * {@link org.eclipse.sirius.properties.DynamicMappingFor#getIterableExpression + * <em>Iterable Expression</em>}</li> * <li>{@link org.eclipse.sirius.properties.DynamicMappingFor#getIfs * <em>Ifs</em>}</li> * </ul> @@ -66,37 +66,36 @@ public interface DynamicMappingFor extends ControlDescription { void setIterator(String value); /** - * Returns the value of the '<em><b>Domain Class Expression</b></em>' - * attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Iterable Expression</b></em>' attribute. + * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Domain Class Expression</em>' attribute isn't + * If the meaning of the '<em>Iterable Expression</em>' attribute isn't * clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> * - * @return the value of the '<em>Domain Class Expression</em>' attribute. - * @see #setDomainClassExpression(String) - * @see org.eclipse.sirius.properties.PropertiesPackage#getDynamicMappingFor_DomainClassExpression() + * @return the value of the '<em>Iterable Expression</em>' attribute. + * @see #setIterableExpression(String) + * @see org.eclipse.sirius.properties.PropertiesPackage#getDynamicMappingFor_IterableExpression() * @model dataType= * "org.eclipse.sirius.viewpoint.description.InterpretedExpression" * required="true" * @generated */ - String getDomainClassExpression(); + String getIterableExpression(); /** * Sets the value of the ' - * {@link org.eclipse.sirius.properties.DynamicMappingFor#getDomainClassExpression - * <em>Domain Class Expression</em>}' attribute. <!-- begin-user-doc --> - * <!-- end-user-doc --> + * {@link org.eclipse.sirius.properties.DynamicMappingFor#getIterableExpression + * <em>Iterable Expression</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @param value - * the new value of the '<em>Domain Class Expression</em>' - * attribute. - * @see #getDomainClassExpression() + * the new value of the '<em>Iterable Expression</em>' attribute. + * @see #getIterableExpression() * @generated */ - void setDomainClassExpression(String value); + void setIterableExpression(String value); /** * Returns the value of the '<em><b>Ifs</b></em>' containment reference diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/FILL_LAYOUT_ORIENTATION.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/FILL_LAYOUT_ORIENTATION.java index a18262df97..63e7a0c096 100644 --- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/FILL_LAYOUT_ORIENTATION.java +++ b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/FILL_LAYOUT_ORIENTATION.java @@ -98,6 +98,9 @@ public enum FILL_LAYOUT_ORIENTATION implements Enumerator { * Returns the '<em><b>FILL LAYOUT ORIENTATION</b></em>' literal with the * specified literal value. <!-- begin-user-doc --> <!-- end-user-doc --> * + * @param literal + * the literal. + * @return the matching enumerator or <code>null</code>. * @generated */ public static FILL_LAYOUT_ORIENTATION get(String literal) { @@ -113,6 +116,9 @@ public enum FILL_LAYOUT_ORIENTATION implements Enumerator { * Returns the '<em><b>FILL LAYOUT ORIENTATION</b></em>' literal with the * specified name. <!-- begin-user-doc --> <!-- end-user-doc --> * + * @param name + * the name. + * @return the matching enumerator or <code>null</code>. * @generated */ public static FILL_LAYOUT_ORIENTATION getByName(String name) { @@ -128,6 +134,9 @@ public enum FILL_LAYOUT_ORIENTATION implements Enumerator { * Returns the '<em><b>FILL LAYOUT ORIENTATION</b></em>' literal with the * specified integer value. <!-- begin-user-doc --> <!-- end-user-doc --> * + * @param value + * the integer value. + * @return the matching enumerator or <code>null</code>. * @generated */ public static FILL_LAYOUT_ORIENTATION get(int value) { diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java index c8b54589b6..7d81a3166f 100644 --- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java +++ b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java @@ -1196,13 +1196,13 @@ public interface PropertiesPackage extends EPackage { int DYNAMIC_MAPPING_FOR__ITERATOR = PropertiesPackage.CONTROL_DESCRIPTION_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Domain Class Expression</b></em>' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Iterable Expression</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION = PropertiesPackage.CONTROL_DESCRIPTION_FEATURE_COUNT + 1; + int DYNAMIC_MAPPING_FOR__ITERABLE_EXPRESSION = PropertiesPackage.CONTROL_DESCRIPTION_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Ifs</b></em>' containment reference list. @@ -4210,17 +4210,16 @@ public interface PropertiesPackage extends EPackage { /** * Returns the meta object for the attribute ' - * {@link org.eclipse.sirius.properties.DynamicMappingFor#getDomainClassExpression - * <em>Domain Class Expression</em>}'. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * {@link org.eclipse.sirius.properties.DynamicMappingFor#getIterableExpression + * <em>Iterable Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc + * --> * - * @return the meta object for the attribute ' - * <em>Domain Class Expression</em>'. - * @see org.eclipse.sirius.properties.DynamicMappingFor#getDomainClassExpression() + * @return the meta object for the attribute '<em>Iterable Expression</em>'. + * @see org.eclipse.sirius.properties.DynamicMappingFor#getIterableExpression() * @see #getDynamicMappingFor() * @generated */ - EAttribute getDynamicMappingFor_DomainClassExpression(); + EAttribute getDynamicMappingFor_IterableExpression(); /** * Returns the meta object for the containment reference list ' @@ -6257,13 +6256,12 @@ public interface PropertiesPackage extends EPackage { EAttribute DYNAMIC_MAPPING_FOR__ITERATOR = PropertiesPackage.eINSTANCE.getDynamicMappingFor_Iterator(); /** - * The meta object literal for the ' - * <em><b>Domain Class Expression</b></em>' attribute feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Iterable Expression</b></em>' + * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - EAttribute DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION = PropertiesPackage.eINSTANCE.getDynamicMappingFor_DomainClassExpression(); + EAttribute DYNAMIC_MAPPING_FOR__ITERABLE_EXPRESSION = PropertiesPackage.eINSTANCE.getDynamicMappingFor_IterableExpression(); /** * The meta object literal for the '<em><b>Ifs</b></em>' containment diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TitleBarStyle.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TitleBarStyle.java index b1add11380..2ae51949af 100644 --- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TitleBarStyle.java +++ b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TitleBarStyle.java @@ -123,6 +123,9 @@ public enum TitleBarStyle implements Enumerator { * Returns the '<em><b>Title Bar Style</b></em>' literal with the specified * literal value. <!-- begin-user-doc --> <!-- end-user-doc --> * + * @param literal + * the literal. + * @return the matching enumerator or <code>null</code>. * @generated */ public static TitleBarStyle get(String literal) { @@ -138,6 +141,9 @@ public enum TitleBarStyle implements Enumerator { * Returns the '<em><b>Title Bar Style</b></em>' literal with the specified * name. <!-- begin-user-doc --> <!-- end-user-doc --> * + * @param name + * the name. + * @return the matching enumerator or <code>null</code>. * @generated */ public static TitleBarStyle getByName(String name) { @@ -153,6 +159,9 @@ public enum TitleBarStyle implements Enumerator { * Returns the '<em><b>Title Bar Style</b></em>' literal with the specified * integer value. <!-- begin-user-doc --> <!-- end-user-doc --> * + * @param value + * the integer value. + * @return the matching enumerator or <code>null</code>. * @generated */ public static TitleBarStyle get(int value) { diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ToggleStyle.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ToggleStyle.java index b250a226db..6ef6e7af31 100644 --- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ToggleStyle.java +++ b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ToggleStyle.java @@ -122,6 +122,9 @@ public enum ToggleStyle implements Enumerator { * Returns the '<em><b>Toggle Style</b></em>' literal with the specified * literal value. <!-- begin-user-doc --> <!-- end-user-doc --> * + * @param literal + * the literal. + * @return the matching enumerator or <code>null</code>. * @generated */ public static ToggleStyle get(String literal) { @@ -137,6 +140,9 @@ public enum ToggleStyle implements Enumerator { * Returns the '<em><b>Toggle Style</b></em>' literal with the specified * name. <!-- begin-user-doc --> <!-- end-user-doc --> * + * @param name + * the name. + * @return the matching enumerator or <code>null</code>. * @generated */ public static ToggleStyle getByName(String name) { @@ -152,6 +158,9 @@ public enum ToggleStyle implements Enumerator { * Returns the '<em><b>Toggle Style</b></em>' literal with the specified * integer value. <!-- begin-user-doc --> <!-- end-user-doc --> * + * @param value + * the integer value. + * @return the matching enumerator or <code>null</code>. * @generated */ public static ToggleStyle get(int value) { diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java index f8df4bf166..6e9ef6d6bc 100644 --- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java +++ b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java @@ -36,8 +36,8 @@ import org.eclipse.sirius.properties.PropertiesPackage; * {@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl#getIterator * <em>Iterator</em>}</li> * <li> - * {@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl#getDomainClassExpression - * <em>Domain Class Expression</em>}</li> + * {@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl#getIterableExpression + * <em>Iterable Expression</em>}</li> * <li>{@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl#getIfs * <em>Ifs</em>}</li> * </ul> @@ -66,26 +66,26 @@ public class DynamicMappingForImpl extends ControlDescriptionImpl implements Dyn protected String iterator = DynamicMappingForImpl.ITERATOR_EDEFAULT; /** - * The default value of the '{@link #getDomainClassExpression() - * <em>Domain Class Expression</em>}' attribute. <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The default value of the '{@link #getIterableExpression() + * <em>Iterable Expression</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> * - * @see #getDomainClassExpression() + * @see #getIterableExpression() * @generated * @ordered */ - protected static final String DOMAIN_CLASS_EXPRESSION_EDEFAULT = null; + protected static final String ITERABLE_EXPRESSION_EDEFAULT = null; /** - * The cached value of the '{@link #getDomainClassExpression() - * <em>Domain Class Expression</em>}' attribute. <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The cached value of the '{@link #getIterableExpression() + * <em>Iterable Expression</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> * - * @see #getDomainClassExpression() + * @see #getIterableExpression() * @generated * @ordered */ - protected String domainClassExpression = DynamicMappingForImpl.DOMAIN_CLASS_EXPRESSION_EDEFAULT; + protected String iterableExpression = DynamicMappingForImpl.ITERABLE_EXPRESSION_EDEFAULT; /** * The cached value of the '{@link #getIfs() <em>Ifs</em>}' containment @@ -146,8 +146,8 @@ public class DynamicMappingForImpl extends ControlDescriptionImpl implements Dyn * @generated */ @Override - public String getDomainClassExpression() { - return domainClassExpression; + public String getIterableExpression() { + return iterableExpression; } /** @@ -156,11 +156,11 @@ public class DynamicMappingForImpl extends ControlDescriptionImpl implements Dyn * @generated */ @Override - public void setDomainClassExpression(String newDomainClassExpression) { - String oldDomainClassExpression = domainClassExpression; - domainClassExpression = newDomainClassExpression; + public void setIterableExpression(String newIterableExpression) { + String oldIterableExpression = iterableExpression; + iterableExpression = newIterableExpression; if (eNotificationRequired()) { - eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION, oldDomainClassExpression, domainClassExpression)); + eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERABLE_EXPRESSION, oldIterableExpression, iterableExpression)); } } @@ -201,8 +201,8 @@ public class DynamicMappingForImpl extends ControlDescriptionImpl implements Dyn switch (featureID) { case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR: return getIterator(); - case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION: - return getDomainClassExpression(); + case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERABLE_EXPRESSION: + return getIterableExpression(); case PropertiesPackage.DYNAMIC_MAPPING_FOR__IFS: return getIfs(); } @@ -221,8 +221,8 @@ public class DynamicMappingForImpl extends ControlDescriptionImpl implements Dyn case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR: setIterator((String) newValue); return; - case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION: - setDomainClassExpression((String) newValue); + case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERABLE_EXPRESSION: + setIterableExpression((String) newValue); return; case PropertiesPackage.DYNAMIC_MAPPING_FOR__IFS: getIfs().clear(); @@ -243,8 +243,8 @@ public class DynamicMappingForImpl extends ControlDescriptionImpl implements Dyn case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR: setIterator(DynamicMappingForImpl.ITERATOR_EDEFAULT); return; - case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION: - setDomainClassExpression(DynamicMappingForImpl.DOMAIN_CLASS_EXPRESSION_EDEFAULT); + case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERABLE_EXPRESSION: + setIterableExpression(DynamicMappingForImpl.ITERABLE_EXPRESSION_EDEFAULT); return; case PropertiesPackage.DYNAMIC_MAPPING_FOR__IFS: getIfs().clear(); @@ -263,9 +263,8 @@ public class DynamicMappingForImpl extends ControlDescriptionImpl implements Dyn switch (featureID) { case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR: return DynamicMappingForImpl.ITERATOR_EDEFAULT == null ? iterator != null : !DynamicMappingForImpl.ITERATOR_EDEFAULT.equals(iterator); - case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION: - return DynamicMappingForImpl.DOMAIN_CLASS_EXPRESSION_EDEFAULT == null ? domainClassExpression != null - : !DynamicMappingForImpl.DOMAIN_CLASS_EXPRESSION_EDEFAULT.equals(domainClassExpression); + case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERABLE_EXPRESSION: + return DynamicMappingForImpl.ITERABLE_EXPRESSION_EDEFAULT == null ? iterableExpression != null : !DynamicMappingForImpl.ITERABLE_EXPRESSION_EDEFAULT.equals(iterableExpression); case PropertiesPackage.DYNAMIC_MAPPING_FOR__IFS: return ifs != null && !ifs.isEmpty(); } @@ -286,8 +285,8 @@ public class DynamicMappingForImpl extends ControlDescriptionImpl implements Dyn StringBuffer result = new StringBuffer(super.toString()); result.append(" (iterator: "); //$NON-NLS-1$ result.append(iterator); - result.append(", domainClassExpression: "); //$NON-NLS-1$ - result.append(domainClassExpression); + result.append(", iterableExpression: "); //$NON-NLS-1$ + result.append(iterableExpression); result.append(')'); return result.toString(); } diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java index 02826bb471..5f5b33df53 100644 --- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java +++ b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java @@ -1260,7 +1260,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac * @generated */ @Override - public EAttribute getDynamicMappingFor_DomainClassExpression() { + public EAttribute getDynamicMappingFor_IterableExpression() { return (EAttribute) dynamicMappingForEClass.getEStructuralFeatures().get(1); } @@ -2435,7 +2435,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac dynamicMappingForEClass = createEClass(PropertiesPackage.DYNAMIC_MAPPING_FOR); createEAttribute(dynamicMappingForEClass, PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR); - createEAttribute(dynamicMappingForEClass, PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION); + createEAttribute(dynamicMappingForEClass, PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERABLE_EXPRESSION); createEReference(dynamicMappingForEClass, PropertiesPackage.DYNAMIC_MAPPING_FOR__IFS); dynamicMappingIfEClass = createEClass(PropertiesPackage.DYNAMIC_MAPPING_IF); @@ -2839,7 +2839,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac initEClass(dynamicMappingForEClass, DynamicMappingFor.class, "DynamicMappingFor", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEAttribute(getDynamicMappingFor_Iterator(), ecorePackage.getEString(), "iterator", null, 1, 1, DynamicMappingFor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); - initEAttribute(getDynamicMappingFor_DomainClassExpression(), theDescriptionPackage.getInterpretedExpression(), "domainClassExpression", null, 1, 1, DynamicMappingFor.class, //$NON-NLS-1$ + initEAttribute(getDynamicMappingFor_IterableExpression(), theDescriptionPackage.getInterpretedExpression(), "iterableExpression", null, 1, 1, DynamicMappingFor.class, //$NON-NLS-1$ !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); initEReference(getDynamicMappingFor_Ifs(), this.getDynamicMappingIf(), null, "ifs", null, 1, -1, DynamicMappingFor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ diff --git a/plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF index c9b0a8dc70..5966135d1a 100644 --- a/plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF @@ -38,4 +38,5 @@ Bundle-Localization: plugin Export-Package: org.eclipse.sirius.ui.properties.api;version="4.1.0", org.eclipse.sirius.ui.properties.internal;version="4.1.0";x-internal:=true, org.eclipse.sirius.ui.properties.internal.expressions;version="4.1.0";x-internal:=true, + org.eclipse.sirius.ui.properties.internal.migration;version="4.1.0";x-internal:=true, org.eclipse.sirius.ui.properties.internal.tabprovider;version="4.1.0";x-internal:=true diff --git a/plugins/org.eclipse.sirius.ui.properties/plugin.xml b/plugins/org.eclipse.sirius.ui.properties/plugin.xml index a5ffc720de..09226deea4 100644 --- a/plugins/org.eclipse.sirius.ui.properties/plugin.xml +++ b/plugins/org.eclipse.sirius.ui.properties/plugin.xml @@ -68,4 +68,11 @@ class="org.eclipse.sirius.ui.properties.internal.expressions.PropertiesExpressionQueryProvider"> </interpretedExpressionProvider> </extension> + <extension + point="org.eclipse.sirius.migrationParticipant"> + <participant + class="org.eclipse.sirius.ui.properties.internal.migration.DomainClassExpressionMigrationParticipant" + kind="VSM"> + </participant> + </extension> </plugin> diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/PropertiesInterpretedExpressionQuery.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/PropertiesInterpretedExpressionQuery.java index c3983eb4ba..9415209789 100644 --- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/PropertiesInterpretedExpressionQuery.java +++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/PropertiesInterpretedExpressionQuery.java @@ -195,7 +195,7 @@ public final class PropertiesInterpretedExpressionQuery extends AbstractInterpre DynamicMappingFor forDefinition = (DynamicMappingFor) target.eContainer(); String iteratorName = forDefinition.getIterator(); if (!Util.isBlank(iteratorName)) { - VariableType iteratorType = getResultType(forDefinition, PropertiesPackage.Literals.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION); + VariableType iteratorType = getResultType(forDefinition, PropertiesPackage.Literals.DYNAMIC_MAPPING_FOR__ITERABLE_EXPRESSION); availableVariables.put(iteratorName, iteratorType); } } diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/migration/DomainClassExpressionMigrationParticipant.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/migration/DomainClassExpressionMigrationParticipant.java new file mode 100644 index 0000000000..1e06036008 --- /dev/null +++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/migration/DomainClassExpressionMigrationParticipant.java @@ -0,0 +1,44 @@ +/******************************************************************************* + * Copyright (c) 2016 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.sirius.ui.properties.internal.migration; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.sirius.business.api.migration.AbstractVSMMigrationParticipant; +import org.eclipse.sirius.properties.PropertiesPackage; +import org.osgi.framework.Version; + +/** + * This class is responsible for the migration of the structural feature + * "domainClassExpression" to "iterableExpression" in a dynamic mapping for. + * + * @author sbegaudeau + */ +public class DomainClassExpressionMigrationParticipant extends AbstractVSMMigrationParticipant { + + private static final Version MIGRATION_VERSION = new Version("11.0.0.201608291200"); //$NON-NLS-1$ + + private static final String DOMAIN_CLASS_EXPRESSION_NAME = "domainClassExpression"; //$NON-NLS-1$ + + @Override + public Version getMigrationVersion() { + return MIGRATION_VERSION; + } + + @Override + public EStructuralFeature getAttribute(EClass eClass, String name, String loadedVersion) { + if (Version.parseVersion(loadedVersion).compareTo(MIGRATION_VERSION) < 0 && PropertiesPackage.Literals.DYNAMIC_MAPPING_FOR.equals(eClass) && DOMAIN_CLASS_EXPRESSION_NAME.equals(name)) { + return PropertiesPackage.Literals.DYNAMIC_MAPPING_FOR__ITERABLE_EXPRESSION; + } + return super.getAttribute(eClass, name, loadedVersion); + } + +} |