diff options
Diffstat (limited to 'plugins/infra')
55 files changed, 4201 insertions, 2328 deletions
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.properties b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.properties index b9135641d11..a50b696bc44 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.properties +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.properties @@ -13,50 +13,38 @@ pluginName = Papyrus EMF Expressions Edit Support providerName = Eclipse Modeling Project - _UI_CreateChild_text = {0} _UI_CreateChild_text2 = {1} | {0} _UI_CreateChild_text3 = {1} _UI_CreateChild_tooltip = Create New {0} Under {1} Feature _UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}. _UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent. - _UI_PropertyDescriptor_description = The {0} of the {1} - _UI_IBasicExpressionElement_type = IBasic Expression Element _UI_IExpression_type = IExpression _UI_ExpressionCatalog_type = Expression Catalog -_UI_EClass_type = EClass -_UI_EObject_type = EObject _UI_OrExpression_type = Or Expression +_UI_AbtractMultiBooleanEObjectExpressionsOwnedExpression_type = Abtract Multi Boolean EObject Expressions Owned Expression _UI_IBooleanEObjectExpression_type = IBoolean EObject Expression _UI_IBooleanExpression_type = IBoolean Expression +_UI_AbstractMultiBooleanEObjectExpressionsReferenceExpression_type = Abstract Multi Boolean EObject Expressions Reference Expression _UI_AndExpression_type = And Expression _UI_NotExpression_type = Not Expression +_UI_AbstractSingleBooleanEObjectExpressionOwnedExpression_type = Abstract Single Boolean EObject Expression Owned Expression +_UI_AbstractSingleBooleanEObjectExpressionReferenceExpression_type = Abstract Single Boolean EObject Expression Reference Expression _UI_LiteralTrueExpression_type = Literal True Expression _UI_LiteralFalseExpression_type = Literal False Expression _UI_ReferenceBooleanExpression_type = Reference Boolean Expression +_UI_SingleEAttributeValueEqualityExpression_type = Single EAttribute Value Equality Expression _UI_Unknown_type = Object - _UI_Unknown_datatype= Value - _UI_IBasicExpressionElement_name_feature = Name _UI_IBasicExpressionElement_description_feature = Description _UI_ExpressionCatalog_expressions_feature = Expressions -_UI_OrExpression_ownedExpressions_feature = Owned Expressions -_UI_OrExpression_referencedExpressions_feature = Referenced Expressions -_UI_AndExpression_ownedExpressions_feature = Owned Expressions -_UI_AndExpression_referencedExpressions_feature = Referenced Expressions -_UI_NotExpression_ownedExpression_feature = Owned Expression -_UI_NotExpression_referencedExpression_feature = Referenced Expression -_UI_ReferenceBooleanExpression_referencedExpression_feature = Referenced Expression -_UI_Unknown_feature = Unspecified - - -Bundle-Description = This plugin provides Icons and item providers for the EMF Expressions Framework. -_UI_SingleEAttributeValueEquality_type = Single EAttribute Value Equality -_UI_SingleEAttributeValueEquality_eAttribute_feature = EAttribute -_UI_SingleEAttributeValueEquality_expectedValue_feature = Expected Value -_UI_SingleEAttributeValueEqualityExpression_type = Single EAttribute Value Equality Expression +_UI_AbtractMultiBooleanEObjectExpressionsOwnedExpression_ownedExpressions_feature = Owned Expressions +_UI_AbstractMultiBooleanEObjectExpressionsReferenceExpression_referencedExpressions_feature = Referenced Expressions +_UI_AbstractSingleBooleanEObjectExpressionOwnedExpression_ownedExpression_feature = Owned Expression +_UI_AbstractSingleBooleanEObjectExpressionReferenceExpression_referencedExpression_feature = Referenced Expression _UI_SingleEAttributeValueEqualityExpression_eAttribute_feature = EAttribute _UI_SingleEAttributeValueEqualityExpression_expectedValue_feature = Expected Value +_UI_Unknown_feature = Unspecified diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.xml b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.xml index 2f720c4628c..6d95567681b 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.xml +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.xml @@ -67,12 +67,12 @@ uri="http://www.eclipse.org/papyrus/expressions/singleEAttributeReference"> </factory> <factory - class="org.eclipse.papyrus.infra.emf.expressions.edit.internal.editor.factories.SingleBooleanExpressionReferenceEditorFactory" - uri="http://www.eclipse.org/papyrus/expressions/singleBooleanExpressionReference"> + class="org.eclipse.papyrus.infra.emf.expressions.edit.internal.editor.factories.SingleBooleanEObjectExpressionReferenceEditorFactory" + uri="http://www.eclipse.org/papyrus/expressions/SingleBooleanEObjectExpressionReferenceExpression/referencedExpression"> </factory> <factory - class="org.eclipse.papyrus.infra.emf.expressions.edit.internal.editor.factories.MultiBooleanExpressionsReferenceEditorFactory" - uri="http://www.eclipse.org/papyrus/expressions/multiBooleanExpressionsReference"> + class="org.eclipse.papyrus.infra.emf.expressions.edit.internal.editor.factories.MultiBooleanEObjectExpressionsReferenceEditorFactory" + uri="http://www.eclipse.org/papyrus/expressions/MultiBooleanEObjectExpressionsReferenceExpression/referencedExpressions"> </factory> </extension> diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AbstractMultiBooleanEObjectExpressionsReferenceExpressionItemProvider.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AbstractMultiBooleanEObjectExpressionsReferenceExpressionItemProvider.java new file mode 100755 index 00000000000..25372a50e8b --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AbstractMultiBooleanEObjectExpressionsReferenceExpressionItemProvider.java @@ -0,0 +1,220 @@ +/** + * Copyright (c) 2017 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + */ +package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider; + + +import java.util.Collection; +import java.util.List; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.common.util.URI; + +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IChildCreationExtender; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; +import org.eclipse.emf.edit.provider.ViewerNotification; + +import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage; + +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractMultiBooleanEObjectExpressionsReferenceExpression; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; + +/** + * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractMultiBooleanEObjectExpressionsReferenceExpression} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class AbstractMultiBooleanEObjectExpressionsReferenceExpressionItemProvider + extends ItemProviderAdapter + implements + IEditingDomainItemProvider, + IStructuredItemContentProvider, + ITreeItemContentProvider, + IItemLabelProvider, + IItemPropertySource { + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public AbstractMultiBooleanEObjectExpressionsReferenceExpressionItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + addNamePropertyDescriptor(object); + addDescriptionPropertyDescriptor(object); + addReferencedExpressionsPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * 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_IBasicExpressionElement_name_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_name_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the Description feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addDescriptionPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_IBasicExpressionElement_description_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_description_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__DESCRIPTION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the Referenced Expressions feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addReferencedExpressionsPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_AbstractMultiBooleanEObjectExpressionsReferenceExpression_referencedExpressions_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_AbstractMultiBooleanEObjectExpressionsReferenceExpression_referencedExpressions_feature", "_UI_AbstractMultiBooleanEObjectExpressionsReferenceExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + BooleanExpressionsPackage.Literals.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__REFERENCED_EXPRESSIONS, + true, + false, + true, + null, + null, + null, + URI.createURI("http://www.eclipse.org/papyrus/expressions/MultiBooleanEObjectExpressionsReferenceExpression/referencedExpressions"))); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected boolean shouldComposeCreationImage() { + return true; + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getText(Object object) { + String label = ((AbstractMultiBooleanEObjectExpressionsReferenceExpression)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_AbstractMultiBooleanEObjectExpressionsReferenceExpression_type") : //$NON-NLS-1$ + getString("_UI_AbstractMultiBooleanEObjectExpressionsReferenceExpression_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + } + + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + updateChildren(notification); + + switch (notification.getFeatureID(AbstractMultiBooleanEObjectExpressionsReferenceExpression.class)) { + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__NAME: + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__DESCRIPTION: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + + /** + * Return the resource locator for this item provider's resources. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public ResourceLocator getResourceLocator() { + return ((IChildCreationExtender)adapterFactory).getResourceLocator(); + } + +} diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AbstractSingleBooleanEObjectExpressionOwnedExpressionItemProvider.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AbstractSingleBooleanEObjectExpressionOwnedExpressionItemProvider.java new file mode 100755 index 00000000000..b01541522e8 --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AbstractSingleBooleanEObjectExpressionOwnedExpressionItemProvider.java @@ -0,0 +1,266 @@ +/** + * Copyright (c) 2017 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + */ +package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider; + + +import java.util.Collection; +import java.util.List; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.common.util.ResourceLocator; + +import org.eclipse.emf.ecore.EStructuralFeature; + +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IChildCreationExtender; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; +import org.eclipse.emf.edit.provider.ViewerNotification; + +import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage; + +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionOwnedExpression; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsFactory; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; + +/** + * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionOwnedExpression} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class AbstractSingleBooleanEObjectExpressionOwnedExpressionItemProvider + extends ItemProviderAdapter + implements + IEditingDomainItemProvider, + IStructuredItemContentProvider, + ITreeItemContentProvider, + IItemLabelProvider, + IItemPropertySource { + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public AbstractSingleBooleanEObjectExpressionOwnedExpressionItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + addNamePropertyDescriptor(object); + addDescriptionPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * 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_IBasicExpressionElement_name_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_name_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the Description feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addDescriptionPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_IBasicExpressionElement_description_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_description_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__DESCRIPTION, + 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}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { + if (childrenFeatures == null) { + super.getChildrenFeatures(object); + childrenFeatures.add(BooleanExpressionsPackage.Literals.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION); + } + return childrenFeatures; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EStructuralFeature getChildFeature(Object object, Object child) { + // Check the type of the specified child object and return the proper feature to use for + // adding (see {@link AddCommand}) it as a child. + + return super.getChildFeature(object, child); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected boolean shouldComposeCreationImage() { + return true; + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getText(Object object) { + String label = ((AbstractSingleBooleanEObjectExpressionOwnedExpression)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_AbstractSingleBooleanEObjectExpressionOwnedExpression_type") : //$NON-NLS-1$ + getString("_UI_AbstractSingleBooleanEObjectExpressionOwnedExpression_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + } + + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + updateChildren(notification); + + switch (notification.getFeatureID(AbstractSingleBooleanEObjectExpressionOwnedExpression.class)) { + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__NAME: + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__DESCRIPTION: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION, + BooleanExpressionsFactory.eINSTANCE.createOrExpression())); + + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION, + BooleanExpressionsFactory.eINSTANCE.createAndExpression())); + + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION, + BooleanExpressionsFactory.eINSTANCE.createNotExpression())); + + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION, + BooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression())); + + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION, + BooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression())); + + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION, + BooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression())); + + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION, + BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression())); + } + + /** + * Return the resource locator for this item provider's resources. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public ResourceLocator getResourceLocator() { + return ((IChildCreationExtender)adapterFactory).getResourceLocator(); + } + +} diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AbstractSingleBooleanEObjectExpressionReferenceExpressionItemProvider.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AbstractSingleBooleanEObjectExpressionReferenceExpressionItemProvider.java new file mode 100755 index 00000000000..b125a19059b --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AbstractSingleBooleanEObjectExpressionReferenceExpressionItemProvider.java @@ -0,0 +1,219 @@ +/** + * Copyright (c) 2017 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + */ +package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider; + + +import java.util.Collection; +import java.util.List; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.common.util.URI; + +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IChildCreationExtender; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; + +import org.eclipse.emf.edit.provider.ViewerNotification; +import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionReferenceExpression; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; + +/** + * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionReferenceExpression} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class AbstractSingleBooleanEObjectExpressionReferenceExpressionItemProvider + extends ItemProviderAdapter + implements + IEditingDomainItemProvider, + IStructuredItemContentProvider, + ITreeItemContentProvider, + IItemLabelProvider, + IItemPropertySource { + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public AbstractSingleBooleanEObjectExpressionReferenceExpressionItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + addNamePropertyDescriptor(object); + addDescriptionPropertyDescriptor(object); + addReferencedExpressionPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * 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_IBasicExpressionElement_name_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_name_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the Description feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addDescriptionPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_IBasicExpressionElement_description_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_description_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__DESCRIPTION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the Referenced Expression feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addReferencedExpressionPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_AbstractSingleBooleanEObjectExpressionReferenceExpression_referencedExpression_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_AbstractSingleBooleanEObjectExpressionReferenceExpression_referencedExpression_feature", "_UI_AbstractSingleBooleanEObjectExpressionReferenceExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + BooleanExpressionsPackage.Literals.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__REFERENCED_EXPRESSION, + true, + false, + true, + null, + null, + null, + URI.createURI("http://www.eclipse.org/papyrus/expressions/SingleBooleanEObjectExpressionReferenceExpression/referencedExpression"))); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected boolean shouldComposeCreationImage() { + return true; + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getText(Object object) { + String label = ((AbstractSingleBooleanEObjectExpressionReferenceExpression)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_AbstractSingleBooleanEObjectExpressionReferenceExpression_type") : //$NON-NLS-1$ + getString("_UI_AbstractSingleBooleanEObjectExpressionReferenceExpression_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + } + + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + updateChildren(notification); + + switch (notification.getFeatureID(AbstractSingleBooleanEObjectExpressionReferenceExpression.class)) { + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__NAME: + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__DESCRIPTION: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + + /** + * Return the resource locator for this item provider's resources. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public ResourceLocator getResourceLocator() { + return ((IChildCreationExtender)adapterFactory).getResourceLocator(); + } + +} diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AbtractMultiBooleanEObjectExpressionsOwnedExpressionItemProvider.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AbtractMultiBooleanEObjectExpressionsOwnedExpressionItemProvider.java new file mode 100755 index 00000000000..6b694159648 --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AbtractMultiBooleanEObjectExpressionsOwnedExpressionItemProvider.java @@ -0,0 +1,266 @@ +/** + * Copyright (c) 2017 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + */ +package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider; + + +import java.util.Collection; +import java.util.List; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.common.util.ResourceLocator; + +import org.eclipse.emf.ecore.EStructuralFeature; + +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IChildCreationExtender; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; +import org.eclipse.emf.edit.provider.ViewerNotification; + +import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage; + +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbtractMultiBooleanEObjectExpressionsOwnedExpression; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsFactory; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; + +/** + * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbtractMultiBooleanEObjectExpressionsOwnedExpression} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class AbtractMultiBooleanEObjectExpressionsOwnedExpressionItemProvider + extends ItemProviderAdapter + implements + IEditingDomainItemProvider, + IStructuredItemContentProvider, + ITreeItemContentProvider, + IItemLabelProvider, + IItemPropertySource { + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public AbtractMultiBooleanEObjectExpressionsOwnedExpressionItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + addNamePropertyDescriptor(object); + addDescriptionPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * 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_IBasicExpressionElement_name_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_name_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the Description feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addDescriptionPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_IBasicExpressionElement_description_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_description_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__DESCRIPTION, + 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}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { + if (childrenFeatures == null) { + super.getChildrenFeatures(object); + childrenFeatures.add(BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS); + } + return childrenFeatures; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EStructuralFeature getChildFeature(Object object, Object child) { + // Check the type of the specified child object and return the proper feature to use for + // adding (see {@link AddCommand}) it as a child. + + return super.getChildFeature(object, child); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected boolean shouldComposeCreationImage() { + return true; + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getText(Object object) { + String label = ((AbtractMultiBooleanEObjectExpressionsOwnedExpression)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_AbtractMultiBooleanEObjectExpressionsOwnedExpression_type") : //$NON-NLS-1$ + getString("_UI_AbtractMultiBooleanEObjectExpressionsOwnedExpression_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + } + + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + updateChildren(notification); + + switch (notification.getFeatureID(AbtractMultiBooleanEObjectExpressionsOwnedExpression.class)) { + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__NAME: + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__DESCRIPTION: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, + BooleanExpressionsFactory.eINSTANCE.createOrExpression())); + + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, + BooleanExpressionsFactory.eINSTANCE.createAndExpression())); + + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, + BooleanExpressionsFactory.eINSTANCE.createNotExpression())); + + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, + BooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression())); + + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, + BooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression())); + + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, + BooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression())); + + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, + BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression())); + } + + /** + * Return the resource locator for this item provider's resources. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public ResourceLocator getResourceLocator() { + return ((IChildCreationExtender)adapterFactory).getResourceLocator(); + } + +} diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AndExpressionItemProvider.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AndExpressionItemProvider.java index b936ef6e22d..e531a7a80f0 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AndExpressionItemProvider.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/AndExpressionItemProvider.java @@ -19,26 +19,9 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.common.util.URI; - import org.eclipse.emf.ecore.EStructuralFeature; - -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IChildCreationExtender; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - -import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage; - import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsFactory; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; @@ -50,13 +33,7 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpre * @generated */ public class AndExpressionItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { + extends AbstractMultiBooleanEObjectExpressionsReferenceExpressionItemProvider { /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> @@ -78,81 +55,11 @@ public class AndExpressionItemProvider if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addNamePropertyDescriptor(object); - addDescriptionPropertyDescriptor(object); - addReferencedExpressionsPropertyDescriptor(object); } return itemPropertyDescriptors; } /** - * 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_IBasicExpressionElement_name_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_name_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Description feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addDescriptionPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IBasicExpressionElement_description_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_description_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__DESCRIPTION, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Referenced Expressions feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addReferencedExpressionsPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_AndExpression_referencedExpressions_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_AndExpression_referencedExpressions_feature", "_UI_AndExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - BooleanExpressionsPackage.Literals.AND_EXPRESSION__REFERENCED_EXPRESSIONS, - true, - false, - true, - null, - null, - null, - URI.createURI("http://www.eclipse.org/papyrus/expressions/multiBooleanExpressionsReference"))); - } - - /** * 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}. @@ -164,7 +71,7 @@ public class AndExpressionItemProvider public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { if (childrenFeatures == null) { super.getChildrenFeatures(object); - childrenFeatures.add(BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS); + childrenFeatures.add(BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS); } return childrenFeatures; } @@ -230,10 +137,6 @@ public class AndExpressionItemProvider updateChildren(notification); switch (notification.getFeatureID(AndExpression.class)) { - case BooleanExpressionsPackage.AND_EXPRESSION__NAME: - case BooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; case BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; @@ -254,49 +157,38 @@ public class AndExpressionItemProvider newChildDescriptors.add (createChildParameter - (BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS, + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, BooleanExpressionsFactory.eINSTANCE.createOrExpression())); newChildDescriptors.add (createChildParameter - (BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS, + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, BooleanExpressionsFactory.eINSTANCE.createAndExpression())); newChildDescriptors.add (createChildParameter - (BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS, + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, BooleanExpressionsFactory.eINSTANCE.createNotExpression())); newChildDescriptors.add (createChildParameter - (BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS, + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, BooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression())); newChildDescriptors.add (createChildParameter - (BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS, + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, BooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression())); newChildDescriptors.add (createChildParameter - (BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS, + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, BooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression())); newChildDescriptors.add (createChildParameter - (BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS, + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression())); } - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public ResourceLocator getResourceLocator() { - return ((IChildCreationExtender)adapterFactory).getResourceLocator(); - } - } diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/NotExpressionItemProvider.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/NotExpressionItemProvider.java index 1b32fbdc57d..e8f8a4be409 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/NotExpressionItemProvider.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/NotExpressionItemProvider.java @@ -19,27 +19,9 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.common.util.URI; - -import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IChildCreationExtender; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; -import org.eclipse.emf.edit.provider.ViewerNotification; - -import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage; - -import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsFactory; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression; @@ -50,13 +32,7 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpressio * @generated */ public class NotExpressionItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { + extends AbstractSingleBooleanEObjectExpressionOwnedExpressionItemProvider { /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> @@ -78,58 +54,12 @@ public class NotExpressionItemProvider if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addNamePropertyDescriptor(object); - addDescriptionPropertyDescriptor(object); addReferencedExpressionPropertyDescriptor(object); } return itemPropertyDescriptors; } /** - * 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_IBasicExpressionElement_name_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_name_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Description feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addDescriptionPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IBasicExpressionElement_description_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_description_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__DESCRIPTION, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** * This adds a property descriptor for the Referenced Expression feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -140,46 +70,16 @@ public class NotExpressionItemProvider (createItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_NotExpression_referencedExpression_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_NotExpression_referencedExpression_feature", "_UI_NotExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - BooleanExpressionsPackage.Literals.NOT_EXPRESSION__REFERENCED_EXPRESSION, + getString("_UI_AbstractSingleBooleanEObjectExpressionReferenceExpression_referencedExpression_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_AbstractSingleBooleanEObjectExpressionReferenceExpression_referencedExpression_feature", "_UI_AbstractSingleBooleanEObjectExpressionReferenceExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + BooleanExpressionsPackage.Literals.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__REFERENCED_EXPRESSION, true, false, true, null, null, null, - URI.createURI("http://www.eclipse.org/papyrus/expressions/singleBooleanExpressionReference"))); - } - - /** - * 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}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { - if (childrenFeatures == null) { - super.getChildrenFeatures(object); - childrenFeatures.add(BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION); - } - return childrenFeatures; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper feature to use for - // adding (see {@link AddCommand}) it as a child. - - return super.getChildFeature(object, child); + URI.createURI("http://www.eclipse.org/papyrus/expressions/SingleBooleanEObjectExpressionReferenceExpression/referencedExpression"))); } /** @@ -228,16 +128,6 @@ public class NotExpressionItemProvider @Override public void notifyChanged(Notification notification) { updateChildren(notification); - - switch (notification.getFeatureID(NotExpression.class)) { - case BooleanExpressionsPackage.NOT_EXPRESSION__NAME: - case BooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - case BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); - return; - } super.notifyChanged(notification); } @@ -251,52 +141,6 @@ public class NotExpressionItemProvider @Override protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - - newChildDescriptors.add - (createChildParameter - (BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION, - BooleanExpressionsFactory.eINSTANCE.createOrExpression())); - - newChildDescriptors.add - (createChildParameter - (BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION, - BooleanExpressionsFactory.eINSTANCE.createAndExpression())); - - newChildDescriptors.add - (createChildParameter - (BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION, - BooleanExpressionsFactory.eINSTANCE.createNotExpression())); - - newChildDescriptors.add - (createChildParameter - (BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION, - BooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression())); - - newChildDescriptors.add - (createChildParameter - (BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION, - BooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression())); - - newChildDescriptors.add - (createChildParameter - (BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION, - BooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression())); - - newChildDescriptors.add - (createChildParameter - (BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION, - BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression())); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public ResourceLocator getResourceLocator() { - return ((IChildCreationExtender)adapterFactory).getResourceLocator(); } } diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/OrExpressionItemProvider.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/OrExpressionItemProvider.java index 8e023554595..6c2731409b7 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/OrExpressionItemProvider.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/OrExpressionItemProvider.java @@ -19,26 +19,9 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.common.util.URI; - import org.eclipse.emf.ecore.EStructuralFeature; - -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IChildCreationExtender; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - -import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage; - import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsFactory; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression; @@ -50,13 +33,7 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression * @generated */ public class OrExpressionItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { + extends AbstractMultiBooleanEObjectExpressionsReferenceExpressionItemProvider { /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> @@ -78,81 +55,11 @@ public class OrExpressionItemProvider if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addNamePropertyDescriptor(object); - addDescriptionPropertyDescriptor(object); - addReferencedExpressionsPropertyDescriptor(object); } return itemPropertyDescriptors; } /** - * 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_IBasicExpressionElement_name_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_name_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Description feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addDescriptionPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IBasicExpressionElement_description_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_description_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__DESCRIPTION, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Referenced Expressions feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addReferencedExpressionsPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_OrExpression_referencedExpressions_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_OrExpression_referencedExpressions_feature", "_UI_OrExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - BooleanExpressionsPackage.Literals.OR_EXPRESSION__REFERENCED_EXPRESSIONS, - true, - false, - true, - null, - null, - null, - URI.createURI("http://www.eclipse.org/papyrus/expressions/multiBooleanExpressionsReference"))); - } - - /** * 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}. @@ -164,7 +71,7 @@ public class OrExpressionItemProvider public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { if (childrenFeatures == null) { super.getChildrenFeatures(object); - childrenFeatures.add(BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS); + childrenFeatures.add(BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS); } return childrenFeatures; } @@ -230,10 +137,6 @@ public class OrExpressionItemProvider updateChildren(notification); switch (notification.getFeatureID(OrExpression.class)) { - case BooleanExpressionsPackage.OR_EXPRESSION__NAME: - case BooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; case BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; @@ -254,49 +157,38 @@ public class OrExpressionItemProvider newChildDescriptors.add (createChildParameter - (BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS, + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, BooleanExpressionsFactory.eINSTANCE.createOrExpression())); newChildDescriptors.add (createChildParameter - (BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS, + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, BooleanExpressionsFactory.eINSTANCE.createAndExpression())); newChildDescriptors.add (createChildParameter - (BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS, + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, BooleanExpressionsFactory.eINSTANCE.createNotExpression())); newChildDescriptors.add (createChildParameter - (BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS, + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, BooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression())); newChildDescriptors.add (createChildParameter - (BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS, + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, BooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression())); newChildDescriptors.add (createChildParameter - (BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS, + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, BooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression())); newChildDescriptors.add (createChildParameter - (BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS, + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression())); } - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public ResourceLocator getResourceLocator() { - return ((IChildCreationExtender)adapterFactory).getResourceLocator(); - } - } diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/ReferenceBooleanExpressionItemProvider.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/ReferenceBooleanExpressionItemProvider.java index 327a8713a9d..9c30cdaf4e5 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/ReferenceBooleanExpressionItemProvider.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/provider/ReferenceBooleanExpressionItemProvider.java @@ -19,24 +19,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.common.util.ResourceLocator; - -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IChildCreationExtender; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; -import org.eclipse.emf.edit.provider.ViewerNotification; - -import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage; - -import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression; /** @@ -46,13 +29,7 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBoo * @generated */ public class ReferenceBooleanExpressionItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { + extends AbstractSingleBooleanEObjectExpressionReferenceExpressionItemProvider { /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> @@ -74,80 +51,11 @@ public class ReferenceBooleanExpressionItemProvider if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addNamePropertyDescriptor(object); - addDescriptionPropertyDescriptor(object); - addReferencedExpressionPropertyDescriptor(object); } return itemPropertyDescriptors; } /** - * 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_IBasicExpressionElement_name_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_name_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Description feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addDescriptionPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IBasicExpressionElement_description_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IBasicExpressionElement_description_feature", "_UI_IBasicExpressionElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - ExpressionsPackage.Literals.IBASIC_EXPRESSION_ELEMENT__DESCRIPTION, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Referenced Expression feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addReferencedExpressionPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ReferenceBooleanExpression_referencedExpression_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ReferenceBooleanExpression_referencedExpression_feature", "_UI_ReferenceBooleanExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - BooleanExpressionsPackage.Literals.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION, - true, - false, - true, - null, - null, - null)); - } - - /** * This returns ReferenceBooleanExpression.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -193,13 +101,6 @@ public class ReferenceBooleanExpressionItemProvider @Override public void notifyChanged(Notification notification) { updateChildren(notification); - - switch (notification.getFeatureID(ReferenceBooleanExpression.class)) { - case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME: - case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } super.notifyChanged(notification); } @@ -215,15 +116,4 @@ public class ReferenceBooleanExpressionItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public ResourceLocator getResourceLocator() { - return ((IChildCreationExtender)adapterFactory).getResourceLocator(); - } - } diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/editor/factories/MultiBooleanExpressionsReferenceEditorFactory.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/editor/factories/MultiBooleanEObjectExpressionsReferenceEditorFactory.java index ff5f5b9cea2..6ef053f455d 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/editor/factories/MultiBooleanExpressionsReferenceEditorFactory.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/editor/factories/MultiBooleanEObjectExpressionsReferenceEditorFactory.java @@ -19,11 +19,11 @@ import java.util.Collection; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.papyrus.emf.ui.contentproviders.EcoreContentProvider; import org.eclipse.papyrus.emf.ui.converters.IdentityDisplayConverter; import org.eclipse.papyrus.emf.ui.editor.factories.AbstractEStructuralFeatureDialogEditorFactory; import org.eclipse.papyrus.emf.ui.editor.factories.CustomExtendedDialogCellEditor; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; import org.eclipse.papyrus.infra.emf.expressions.catalog.ExpressionCatalogRegistry; import org.eclipse.papyrus.infra.emf.expressions.edit.internal.validators.MultiBooleanExpressionValidator; @@ -32,19 +32,17 @@ import org.eclipse.papyrus.infra.emf.expressions.edit.internal.validators.MultiB * EditorFactory for Multi BooleanExpression references * */ -public class MultiBooleanExpressionsReferenceEditorFactory extends AbstractEStructuralFeatureDialogEditorFactory { +public class MultiBooleanEObjectExpressionsReferenceEditorFactory extends AbstractEStructuralFeatureDialogEditorFactory { - private static final URI SELF_URI = URI.createURI("http://www.eclipse.org/papyrus/expressions/multiBooleanExpressionsReference"); //$NON-NLS-1$ + private static final URI SELF_URI = URI.createURI("http://www.eclipse.org/papyrus/expressions/MultiBooleanEObjectExpressionsReferenceExpression/referencedExpressions"); //$NON-NLS-1$ /** * * Constructor. * - * @param editedFeature - * the edited feature */ - public MultiBooleanExpressionsReferenceEditorFactory(final EStructuralFeature editedFeature) { - super(SELF_URI, editedFeature); + public MultiBooleanEObjectExpressionsReferenceEditorFactory() { + super(SELF_URI, BooleanExpressionsPackage.eINSTANCE.getAbstractMultiBooleanEObjectExpressionsReferenceExpression_ReferencedExpressions()); } diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/editor/factories/SingleBooleanExpressionReferenceEditorFactory.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/editor/factories/SingleBooleanEObjectExpressionReferenceEditorFactory.java index 3e098368192..314e628f761 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/editor/factories/SingleBooleanExpressionReferenceEditorFactory.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/editor/factories/SingleBooleanEObjectExpressionReferenceEditorFactory.java @@ -19,11 +19,11 @@ import java.util.Collection; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.papyrus.emf.ui.contentproviders.EcoreContentProvider; import org.eclipse.papyrus.emf.ui.converters.IdentityDisplayConverter; import org.eclipse.papyrus.emf.ui.editor.factories.AbstractEStructuralFeatureDialogEditorFactory; import org.eclipse.papyrus.emf.ui.editor.factories.CustomExtendedDialogCellEditor; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; import org.eclipse.papyrus.infra.emf.expressions.catalog.ExpressionCatalogRegistry; import org.eclipse.papyrus.infra.emf.expressions.edit.internal.validators.SingleBooleanExpressionValidator; @@ -32,22 +32,19 @@ import org.eclipse.papyrus.infra.emf.expressions.edit.internal.validators.Single * This editor allows to edit a single reference to an expression * */ -public class SingleBooleanExpressionReferenceEditorFactory extends AbstractEStructuralFeatureDialogEditorFactory { +public class SingleBooleanEObjectExpressionReferenceEditorFactory extends AbstractEStructuralFeatureDialogEditorFactory { /** * The URI of this editor */ - private static final URI SELF_URI = URI.createURI("http://www.eclipse.org/papyrus/expressions/singleBooleanExpressionReference"); //$NON-NLS-1$ + private static final URI SELF_URI = URI.createURI("http://www.eclipse.org/papyrus/expressions/SingleBooleanEObjectExpressionReferenceExpression/referencedExpression"); //$NON-NLS-1$ /** * * Constructor. - * - * @param editedFeature - * the edited feature */ - public SingleBooleanExpressionReferenceEditorFactory(final EStructuralFeature editedFeature) { - super(SELF_URI, editedFeature); + public SingleBooleanEObjectExpressionReferenceEditorFactory() { + super(SELF_URI, BooleanExpressionsPackage.eINSTANCE.getAbstractSingleBooleanEObjectExpressionReferenceExpression_ReferencedExpression()); } diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/messages/Messages.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/messages/Messages.java index dceddaed0f0..73e6f08827e 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/messages/Messages.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/messages/Messages.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2019 CEA LIST and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,7 +10,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.infra.emf.expressions.edit.internal.messages; @@ -22,7 +22,7 @@ import org.eclipse.osgi.util.NLS; * */ public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.emf.expressions.edit.messages.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.emf.expressions.edit.internal.messages.messages"; //$NON-NLS-1$ public static String ManyBooleanExpressionValidator_YouMustSelectOneOrSeveralBooleanExpression; public static String SingleBooleanExpressionValidator_YouMustSelectOneBooleanExpression; static { diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/messages/messages.properties b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/messages/messages.properties index 983e9afcfa3..db74c10434f 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/messages/messages.properties +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/messages/messages.properties @@ -1,2 +1,15 @@ +# Copyright (c) 2017 CEA LIST. +# +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + ManyBooleanExpressionValidator_YouMustSelectOneOrSeveralBooleanExpression=You must select one or several Boolean Expression SingleBooleanExpressionValidator_YouMustSelectOneBooleanExpression=You must select one Boolean Expression diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/properties/EMFExpressionPropertySource.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/properties/EMFExpressionPropertySource.java index a3952f540d2..b954d42bb11 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/properties/EMFExpressionPropertySource.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/src/org/eclipse/papyrus/infra/emf/expressions/edit/internal/properties/EMFExpressionPropertySource.java @@ -22,8 +22,8 @@ import org.eclipse.emf.edit.ui.provider.PropertySource; import org.eclipse.papyrus.emf.ui.editor.factories.AbstractEStructuralFeatureDialogEditorFactory; import org.eclipse.papyrus.emf.ui.properties.CustomPropertyDescriptor; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; -import org.eclipse.papyrus.infra.emf.expressions.edit.internal.editor.factories.MultiBooleanExpressionsReferenceEditorFactory; -import org.eclipse.papyrus.infra.emf.expressions.edit.internal.editor.factories.SingleBooleanExpressionReferenceEditorFactory; +import org.eclipse.papyrus.infra.emf.expressions.edit.internal.editor.factories.MultiBooleanEObjectExpressionsReferenceEditorFactory; +import org.eclipse.papyrus.infra.emf.expressions.edit.internal.editor.factories.SingleBooleanEObjectExpressionReferenceEditorFactory; import org.eclipse.papyrus.infra.emf.expressions.edit.internal.editor.factories.SingleEAttributeReferenceExpressionEditorFactory; import org.eclipse.ui.views.properties.IPropertyDescriptor; @@ -52,14 +52,13 @@ public class EMFExpressionPropertySource extends PropertySource { protected IPropertyDescriptor createPropertyDescriptor(final IItemPropertyDescriptor itemPropertyDescriptor) { final EStructuralFeature f = (EStructuralFeature) itemPropertyDescriptor.getFeature(this.object); AbstractEStructuralFeatureDialogEditorFactory editorFactory = null; - if (f == BooleanExpressionsPackage.eINSTANCE.getAndExpression_ReferencedExpressions() - || f == BooleanExpressionsPackage.eINSTANCE.getOrExpression_ReferencedExpressions()) { - editorFactory = new MultiBooleanExpressionsReferenceEditorFactory(f); + if (f == BooleanExpressionsPackage.eINSTANCE.getAbstractMultiBooleanEObjectExpressionsReferenceExpression_ReferencedExpressions()) { + editorFactory = new MultiBooleanEObjectExpressionsReferenceEditorFactory(); } - if (f == BooleanExpressionsPackage.eINSTANCE.getNotExpression_ReferencedExpression() - || f == BooleanExpressionsPackage.eINSTANCE.getReferenceBooleanExpression_ReferencedExpression()) { - editorFactory = new SingleBooleanExpressionReferenceEditorFactory(f); + if (f == BooleanExpressionsPackage.eINSTANCE.getAbstractSingleBooleanEObjectExpressionReferenceExpression_ReferencedExpression()) { + editorFactory = new SingleBooleanEObjectExpressionReferenceEditorFactory(); } + if (f == BooleanExpressionsPackage.eINSTANCE.getSingleEAttributeValueEqualityExpression_EAttribute()) { editorFactory = new SingleEAttributeReferenceExpressionEditorFactory(); } diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx index 964918b97ff..8cb7c48a5e0 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx @@ -1,279 +1,360 @@ <?xml version="1.0" encoding="ASCII"?> -<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_P83s4I3oEemjwpaBkaWY0Q" name="expressions"> - <tabs xmi:id="_QwT8AI3oEemjwpaBkaWY0Q" label="expressions" id="expressions" priority="100"> - <sections xmi:id="_QwUjEI3oEemjwpaBkaWY0Q" name="Single IBasicExpressionElement" sectionFile="ui/SingleIBasicExpressionElement.xwt"> +<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_DFo8YJJ1EemkbNOY_7-CZA" name="expressions"> + <tabs xmi:id="_Hm6IIJJ1EemkbNOY_7-CZA" label="expressions" id="expressions" priority="100"> + <sections xmi:id="_Hm6vMJJ1EemkbNOY_7-CZA" name="Single IBasicExpressionElement" sectionFile="ui/SingleIBasicExpressionElement.xwt"> <widget href="ui/SingleIBasicExpressionElement.xwt#/"/> </sections> - <sections xmi:id="_QwUjEY3oEemjwpaBkaWY0Q" name="Single IExpression" sectionFile="ui/SingleIExpression.xwt"> + <sections xmi:id="_Hm6vMZJ1EemkbNOY_7-CZA" name="Single IExpression" sectionFile="ui/SingleIExpression.xwt"> <widget href="ui/SingleIExpression.xwt#/"/> </sections> - <sections xmi:id="_QwVKII3oEemjwpaBkaWY0Q" name="Single ExpressionCatalog" sectionFile="ui/SingleExpressionCatalog.xwt"> + <sections xmi:id="_Hm7WQJJ1EemkbNOY_7-CZA" name="Single ExpressionCatalog" sectionFile="ui/SingleExpressionCatalog.xwt"> <widget href="ui/SingleExpressionCatalog.xwt#/"/> </sections> - <sections xmi:id="_QwVKIY3oEemjwpaBkaWY0Q" name="Multiple IBasicExpressionElement" sectionFile="ui/MultipleIBasicExpressionElement.xwt"> + <sections xmi:id="_Hm7WQZJ1EemkbNOY_7-CZA" name="Multiple IBasicExpressionElement" sectionFile="ui/MultipleIBasicExpressionElement.xwt"> <widget href="ui/MultipleIBasicExpressionElement.xwt#/"/> </sections> - <sections xmi:id="_QwVKIo3oEemjwpaBkaWY0Q" name="Multiple IExpression" sectionFile="ui/MultipleIExpression.xwt"> + <sections xmi:id="_Hm7WQpJ1EemkbNOY_7-CZA" name="Multiple IExpression" sectionFile="ui/MultipleIExpression.xwt"> <widget href="ui/MultipleIExpression.xwt#/"/> </sections> - <sections xmi:id="_QwVxMI3oEemjwpaBkaWY0Q" name="Multiple ExpressionCatalog" sectionFile="ui/MultipleExpressionCatalog.xwt"> + <sections xmi:id="_Hm79UJJ1EemkbNOY_7-CZA" name="Multiple ExpressionCatalog" sectionFile="ui/MultipleExpressionCatalog.xwt"> <widget href="ui/MultipleExpressionCatalog.xwt#/"/> </sections> - <sections xmi:id="_QwVxMY3oEemjwpaBkaWY0Q" name="Single IBooleanExpression" sectionFile="ui/SingleIBooleanExpression.xwt"> + <sections xmi:id="_Hm79UZJ1EemkbNOY_7-CZA" name="Single IBooleanExpression" sectionFile="ui/SingleIBooleanExpression.xwt"> <widget href="ui/SingleIBooleanExpression.xwt#/"/> </sections> - <sections xmi:id="_QwVxMo3oEemjwpaBkaWY0Q" name="Multiple IBooleanExpression" sectionFile="ui/MultipleIBooleanExpression.xwt"> + <sections xmi:id="_Hm79UpJ1EemkbNOY_7-CZA" name="Multiple IBooleanExpression" sectionFile="ui/MultipleIBooleanExpression.xwt"> <widget href="ui/MultipleIBooleanExpression.xwt#/"/> </sections> - <sections xmi:id="_QwWYQI3oEemjwpaBkaWY0Q" name="Single IBooleanEObjectExpression" sectionFile="ui/SingleIBooleanEObjectExpression.xwt"> + <sections xmi:id="_Hm8kYJJ1EemkbNOY_7-CZA" name="Single IBooleanEObjectExpression" sectionFile="ui/SingleIBooleanEObjectExpression.xwt"> <widget href="ui/SingleIBooleanEObjectExpression.xwt#/"/> </sections> - <sections xmi:id="_QwWYQY3oEemjwpaBkaWY0Q" name="Multiple IBooleanEObjectExpression" sectionFile="ui/MultipleIBooleanEObjectExpression.xwt"> + <sections xmi:id="_Hm8kYZJ1EemkbNOY_7-CZA" name="Multiple IBooleanEObjectExpression" sectionFile="ui/MultipleIBooleanEObjectExpression.xwt"> <widget href="ui/MultipleIBooleanEObjectExpression.xwt#/"/> </sections> - <sections xmi:id="_QwW_UI3oEemjwpaBkaWY0Q" name="Single OrExpression" sectionFile="ui/SingleOrExpression.xwt"> + <sections xmi:id="_Hm9LcJJ1EemkbNOY_7-CZA" name="Single AbstractMultiBooleanEObjectExpressionsReferenceExpression" sectionFile="ui/SingleAbstractMultiBooleanEObjectExpressionsReferenceExpression.xwt"> + <widget href="ui/SingleAbstractMultiBooleanEObjectExpressionsReferenceExpression.xwt#/"/> + </sections> + <sections xmi:id="_Hm9LcZJ1EemkbNOY_7-CZA" name="Multiple AbstractMultiBooleanEObjectExpressionsReferenceExpression" sectionFile="ui/MultipleAbstractMultiBooleanEObjectExpressionsReferenceExpression.xwt"> + <widget href="ui/MultipleAbstractMultiBooleanEObjectExpressionsReferenceExpression.xwt#/"/> + </sections> + <sections xmi:id="_Hm9ygJJ1EemkbNOY_7-CZA" name="Single AbtractMultiBooleanEObjectExpressionsOwnedExpression" sectionFile="ui/SingleAbtractMultiBooleanEObjectExpressionsOwnedExpression.xwt"> + <widget href="ui/SingleAbtractMultiBooleanEObjectExpressionsOwnedExpression.xwt#/"/> + </sections> + <sections xmi:id="_Hm9ygZJ1EemkbNOY_7-CZA" name="Multiple AbtractMultiBooleanEObjectExpressionsOwnedExpression" sectionFile="ui/MultipleAbtractMultiBooleanEObjectExpressionsOwnedExpression.xwt"> + <widget href="ui/MultipleAbtractMultiBooleanEObjectExpressionsOwnedExpression.xwt#/"/> + </sections> + <sections xmi:id="_Hm-ZkJJ1EemkbNOY_7-CZA" name="Single OrExpression" sectionFile="ui/SingleOrExpression.xwt"> <widget href="ui/SingleOrExpression.xwt#/"/> </sections> - <sections xmi:id="_QwW_UY3oEemjwpaBkaWY0Q" name="Multiple OrExpression" sectionFile="ui/MultipleOrExpression.xwt"> + <sections xmi:id="_Hm-ZkZJ1EemkbNOY_7-CZA" name="Multiple OrExpression" sectionFile="ui/MultipleOrExpression.xwt"> <widget href="ui/MultipleOrExpression.xwt#/"/> </sections> - <sections xmi:id="_QwW_Uo3oEemjwpaBkaWY0Q" name="Single AndExpression" sectionFile="ui/SingleAndExpression.xwt"> + <sections xmi:id="_Hm_AoJJ1EemkbNOY_7-CZA" name="Single AndExpression" sectionFile="ui/SingleAndExpression.xwt"> <widget href="ui/SingleAndExpression.xwt#/"/> </sections> - <sections xmi:id="_QwXmYI3oEemjwpaBkaWY0Q" name="Multiple AndExpression" sectionFile="ui/MultipleAndExpression.xwt"> + <sections xmi:id="_Hm_AoZJ1EemkbNOY_7-CZA" name="Multiple AndExpression" sectionFile="ui/MultipleAndExpression.xwt"> <widget href="ui/MultipleAndExpression.xwt#/"/> </sections> - <sections xmi:id="_QwXmYY3oEemjwpaBkaWY0Q" name="Single NotExpression" sectionFile="ui/SingleNotExpression.xwt"> + <sections xmi:id="_Hm_AopJ1EemkbNOY_7-CZA" name="Single AbstractSingleBooleanEObjectExpressionOwnedExpression" sectionFile="ui/SingleAbstractSingleBooleanEObjectExpressionOwnedExpression.xwt"> + <widget href="ui/SingleAbstractSingleBooleanEObjectExpressionOwnedExpression.xwt#/"/> + </sections> + <sections xmi:id="_Hm_nsJJ1EemkbNOY_7-CZA" name="Multiple AbstractSingleBooleanEObjectExpressionOwnedExpression" sectionFile="ui/MultipleAbstractSingleBooleanEObjectExpressionOwnedExpression.xwt"> + <widget href="ui/MultipleAbstractSingleBooleanEObjectExpressionOwnedExpression.xwt#/"/> + </sections> + <sections xmi:id="_Hm_nsZJ1EemkbNOY_7-CZA" name="Single AbstractSingleBooleanEObjectExpressionReferenceExpression" sectionFile="ui/SingleAbstractSingleBooleanEObjectExpressionReferenceExpression.xwt"> + <widget href="ui/SingleAbstractSingleBooleanEObjectExpressionReferenceExpression.xwt#/"/> + </sections> + <sections xmi:id="_Hm_nspJ1EemkbNOY_7-CZA" name="Multiple AbstractSingleBooleanEObjectExpressionReferenceExpression" sectionFile="ui/MultipleAbstractSingleBooleanEObjectExpressionReferenceExpression.xwt"> + <widget href="ui/MultipleAbstractSingleBooleanEObjectExpressionReferenceExpression.xwt#/"/> + </sections> + <sections xmi:id="_HnAOwJJ1EemkbNOY_7-CZA" name="Single NotExpression" sectionFile="ui/SingleNotExpression.xwt"> <widget href="ui/SingleNotExpression.xwt#/"/> </sections> - <sections xmi:id="_QwYNcI3oEemjwpaBkaWY0Q" name="Multiple NotExpression" sectionFile="ui/MultipleNotExpression.xwt"> + <sections xmi:id="_HnAOwZJ1EemkbNOY_7-CZA" name="Multiple NotExpression" sectionFile="ui/MultipleNotExpression.xwt"> <widget href="ui/MultipleNotExpression.xwt#/"/> </sections> - <sections xmi:id="_QwYNcY3oEemjwpaBkaWY0Q" name="Single LiteralTrueExpression" sectionFile="ui/SingleLiteralTrueExpression.xwt"> + <sections xmi:id="_HnAOwpJ1EemkbNOY_7-CZA" name="Single LiteralTrueExpression" sectionFile="ui/SingleLiteralTrueExpression.xwt"> <widget href="ui/SingleLiteralTrueExpression.xwt#/"/> </sections> - <sections xmi:id="_QwYNco3oEemjwpaBkaWY0Q" name="Multiple LiteralTrueExpression" sectionFile="ui/MultipleLiteralTrueExpression.xwt"> + <sections xmi:id="_HnA10JJ1EemkbNOY_7-CZA" name="Multiple LiteralTrueExpression" sectionFile="ui/MultipleLiteralTrueExpression.xwt"> <widget href="ui/MultipleLiteralTrueExpression.xwt#/"/> </sections> - <sections xmi:id="_QwY0gI3oEemjwpaBkaWY0Q" name="Single LiteralFalseExpression" sectionFile="ui/SingleLiteralFalseExpression.xwt"> + <sections xmi:id="_HnA10ZJ1EemkbNOY_7-CZA" name="Single LiteralFalseExpression" sectionFile="ui/SingleLiteralFalseExpression.xwt"> <widget href="ui/SingleLiteralFalseExpression.xwt#/"/> </sections> - <sections xmi:id="_QwY0gY3oEemjwpaBkaWY0Q" name="Multiple LiteralFalseExpression" sectionFile="ui/MultipleLiteralFalseExpression.xwt"> + <sections xmi:id="_HnA10pJ1EemkbNOY_7-CZA" name="Multiple LiteralFalseExpression" sectionFile="ui/MultipleLiteralFalseExpression.xwt"> <widget href="ui/MultipleLiteralFalseExpression.xwt#/"/> </sections> - <sections xmi:id="_QwZbkI3oEemjwpaBkaWY0Q" name="Single ReferenceBooleanExpression" sectionFile="ui/SingleReferenceBooleanExpression.xwt"> + <sections xmi:id="_HnBc4JJ1EemkbNOY_7-CZA" name="Single ReferenceBooleanExpression" sectionFile="ui/SingleReferenceBooleanExpression.xwt"> <widget href="ui/SingleReferenceBooleanExpression.xwt#/"/> </sections> - <sections xmi:id="_QwZbkY3oEemjwpaBkaWY0Q" name="Multiple ReferenceBooleanExpression" sectionFile="ui/MultipleReferenceBooleanExpression.xwt"> + <sections xmi:id="_HnBc4ZJ1EemkbNOY_7-CZA" name="Multiple ReferenceBooleanExpression" sectionFile="ui/MultipleReferenceBooleanExpression.xwt"> <widget href="ui/MultipleReferenceBooleanExpression.xwt#/"/> </sections> - <sections xmi:id="_QwZbko3oEemjwpaBkaWY0Q" name="Single SingleEAttributeValueEqualityExpression" sectionFile="ui/SingleSingleEAttributeValueEqualityExpression.xwt"> + <sections xmi:id="_HnBc4pJ1EemkbNOY_7-CZA" name="Single SingleEAttributeValueEqualityExpression" sectionFile="ui/SingleSingleEAttributeValueEqualityExpression.xwt"> <widget href="ui/SingleSingleEAttributeValueEqualityExpression.xwt#/"/> </sections> - <sections xmi:id="_QwaCoI3oEemjwpaBkaWY0Q" name="Multiple SingleEAttributeValueEqualityExpression" sectionFile="ui/MultipleSingleEAttributeValueEqualityExpression.xwt"> + <sections xmi:id="_HnCD8JJ1EemkbNOY_7-CZA" name="Multiple SingleEAttributeValueEqualityExpression" sectionFile="ui/MultipleSingleEAttributeValueEqualityExpression.xwt"> <widget href="ui/MultipleSingleEAttributeValueEqualityExpression.xwt#/"/> </sections> </tabs> - <views xmi:id="_P83s4Y3oEemjwpaBkaWY0Q" name="Single IBasicExpressionElement" sections="_QwUjEI3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tQo3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83s4o3oEemjwpaBkaWY0Q" name="isSingleIBasicExpressionElement"> + <views xmi:id="_DFo8YZJ1EemkbNOY_7-CZA" name="Single IBasicExpressionElement" sections="_Hm6vMJJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo84pJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8YpJ1EemkbNOY_7-CZA" name="isSingleIBasicExpressionElement"> + <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8Y5J1EemkbNOY_7-CZA" name="className" value="IBasicExpressionElement"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8ZJJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/> + </constraints> + </views> + <views xmi:id="_DFo8ZZJ1EemkbNOY_7-CZA" name="Single IExpression" sections="_Hm6vMZJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo85ZJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8ZpJ1EemkbNOY_7-CZA" name="isSingleIExpression"> + <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8Z5J1EemkbNOY_7-CZA" name="className" value="IExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8aJJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/> + </constraints> + </views> + <views xmi:id="_DFo8aZJ1EemkbNOY_7-CZA" name="Single ExpressionCatalog" sections="_Hm7WQJJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo85pJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8apJ1EemkbNOY_7-CZA" name="isSingleExpressionCatalog"> + <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8a5J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8bJJ1EemkbNOY_7-CZA" name="className" value="ExpressionCatalog"/> + </constraints> + </views> + <views xmi:id="_DFo8bZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple IBasicExpressionElement" sections="_Hm7WQZJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo84pJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8bpJ1EemkbNOY_7-CZA" name="isMultipleIBasicExpressionElement"> + <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8b5J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8cJJ1EemkbNOY_7-CZA" name="className" value="IBasicExpressionElement"/> + </constraints> + </views> + <views xmi:id="_DFo8cZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple IExpression" sections="_Hm7WQpJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo85ZJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8cpJ1EemkbNOY_7-CZA" name="isMultipleIExpression"> + <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8c5J1EemkbNOY_7-CZA" name="className" value="IExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8dJJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/> + </constraints> + </views> + <views xmi:id="_DFo8dZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple ExpressionCatalog" sections="_Hm79UJJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo85pJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8dpJ1EemkbNOY_7-CZA" name="isMultipleExpressionCatalog"> + <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8d5J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8eJJ1EemkbNOY_7-CZA" name="className" value="ExpressionCatalog"/> + </constraints> + </views> + <views xmi:id="_DFo8eZJ1EemkbNOY_7-CZA" name="Single IBooleanExpression" sections="_Hm79UZJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo87ZJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8epJ1EemkbNOY_7-CZA" name="isSingleIBooleanExpression"> + <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8e5J1EemkbNOY_7-CZA" name="className" value="IBooleanExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8fJJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + </constraints> + </views> + <views xmi:id="_DFo8fZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple IBooleanExpression" sections="_Hm79UpJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo87ZJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8fpJ1EemkbNOY_7-CZA" name="isMultipleIBooleanExpression"> + <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8f5J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8gJJ1EemkbNOY_7-CZA" name="className" value="IBooleanExpression"/> + </constraints> + </views> + <views xmi:id="_DFo8gZJ1EemkbNOY_7-CZA" name="Single IBooleanEObjectExpression" sections="_Hm8kYJJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo87JJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8gpJ1EemkbNOY_7-CZA" name="isSingleIBooleanEObjectExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83s443oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83s5I3oEemjwpaBkaWY0Q" name="className" value="IBasicExpressionElement"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8g5J1EemkbNOY_7-CZA" name="className" value="IBooleanEObjectExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8hJJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> </constraints> </views> - <views xmi:id="_P83s5Y3oEemjwpaBkaWY0Q" name="Single IExpression" sections="_QwUjEY3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tRY3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83s5o3oEemjwpaBkaWY0Q" name="isSingleIExpression"> + <views xmi:id="_DFo8hZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple IBooleanEObjectExpression" sections="_Hm8kYZJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo87JJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8hpJ1EemkbNOY_7-CZA" name="isMultipleIBooleanEObjectExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83s543oEemjwpaBkaWY0Q" name="className" value="IExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83s6I3oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8h5J1EemkbNOY_7-CZA" name="className" value="IBooleanEObjectExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8iJJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> </constraints> </views> - <views xmi:id="_P83s6Y3oEemjwpaBkaWY0Q" name="Single ExpressionCatalog" sections="_QwVKII3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tRo3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83s6o3oEemjwpaBkaWY0Q" name="isSingleExpressionCatalog"> + <views xmi:id="_DFo8iZJ1EemkbNOY_7-CZA" name="Single AbstractMultiBooleanEObjectExpressionsReferenceExpression" sections="_Hm9LcJJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo87pJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8ipJ1EemkbNOY_7-CZA" name="isSingleAbstractMultiBooleanEObjectExpressionsReferenceExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83s643oEemjwpaBkaWY0Q" name="className" value="ExpressionCatalog"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83s7I3oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8i5J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8jJJ1EemkbNOY_7-CZA" name="className" value="AbstractMultiBooleanEObjectExpressionsReferenceExpression"/> </constraints> </views> - <views xmi:id="_P83s7Y3oEemjwpaBkaWY0Q" elementMultiplicity="-1" name="Multiple IBasicExpressionElement" sections="_QwVKIY3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tQo3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83s7o3oEemjwpaBkaWY0Q" name="isMultipleIBasicExpressionElement"> + <views xmi:id="_DFo8jZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple AbstractMultiBooleanEObjectExpressionsReferenceExpression" sections="_Hm9LcZJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo87pJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8jpJ1EemkbNOY_7-CZA" name="isMultipleAbstractMultiBooleanEObjectExpressionsReferenceExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83s743oEemjwpaBkaWY0Q" name="className" value="IBasicExpressionElement"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83s8I3oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8j5J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8kJJ1EemkbNOY_7-CZA" name="className" value="AbstractMultiBooleanEObjectExpressionsReferenceExpression"/> </constraints> </views> - <views xmi:id="_P83s8Y3oEemjwpaBkaWY0Q" elementMultiplicity="-1" name="Multiple IExpression" sections="_QwVKIo3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tRY3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83s8o3oEemjwpaBkaWY0Q" name="isMultipleIExpression"> + <views xmi:id="_DFo8kZJ1EemkbNOY_7-CZA" name="Single AbtractMultiBooleanEObjectExpressionsOwnedExpression" sections="_Hm9ygJJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo86pJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8kpJ1EemkbNOY_7-CZA" name="isSingleAbtractMultiBooleanEObjectExpressionsOwnedExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83s843oEemjwpaBkaWY0Q" name="className" value="IExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83s9I3oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8k5J1EemkbNOY_7-CZA" name="className" value="AbtractMultiBooleanEObjectExpressionsOwnedExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8lJJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> </constraints> </views> - <views xmi:id="_P83s9Y3oEemjwpaBkaWY0Q" elementMultiplicity="-1" name="Multiple ExpressionCatalog" sections="_QwVxMI3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tRo3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83s9o3oEemjwpaBkaWY0Q" name="isMultipleExpressionCatalog"> + <views xmi:id="_DFo8lZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple AbtractMultiBooleanEObjectExpressionsOwnedExpression" sections="_Hm9ygZJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo86pJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8lpJ1EemkbNOY_7-CZA" name="isMultipleAbtractMultiBooleanEObjectExpressionsOwnedExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83s943oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83s-I3oEemjwpaBkaWY0Q" name="className" value="ExpressionCatalog"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8l5J1EemkbNOY_7-CZA" name="className" value="AbtractMultiBooleanEObjectExpressionsOwnedExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8mJJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> </constraints> </views> - <views xmi:id="_P83s-Y3oEemjwpaBkaWY0Q" name="Single IBooleanExpression" sections="_QwVxMY3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tTY3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83s-o3oEemjwpaBkaWY0Q" name="isSingleIBooleanExpression"> + <views xmi:id="_DFo8mZJ1EemkbNOY_7-CZA" name="Single OrExpression" sections="_Hm-ZkJJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo86ZJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8mpJ1EemkbNOY_7-CZA" name="isSingleOrExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83s-43oEemjwpaBkaWY0Q" name="className" value="IBooleanExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83s_I3oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8m5J1EemkbNOY_7-CZA" name="className" value="OrExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8nJJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> </constraints> </views> - <views xmi:id="_P83s_Y3oEemjwpaBkaWY0Q" elementMultiplicity="-1" name="Multiple IBooleanExpression" sections="_QwVxMo3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tTY3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83s_o3oEemjwpaBkaWY0Q" name="isMultipleIBooleanExpression"> + <views xmi:id="_DFo8nZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple OrExpression" sections="_Hm-ZkZJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo86ZJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8npJ1EemkbNOY_7-CZA" name="isMultipleOrExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83s_43oEemjwpaBkaWY0Q" name="className" value="IBooleanExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tAI3oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8n5J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8oJJ1EemkbNOY_7-CZA" name="className" value="OrExpression"/> </constraints> </views> - <views xmi:id="_P83tAY3oEemjwpaBkaWY0Q" name="Single IBooleanEObjectExpression" sections="_QwWYQI3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tTI3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tAo3oEemjwpaBkaWY0Q" name="isSingleIBooleanEObjectExpression"> + <views xmi:id="_DFo8oZJ1EemkbNOY_7-CZA" name="Single AndExpression" sections="_Hm_AoJJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo88JJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8opJ1EemkbNOY_7-CZA" name="isSingleAndExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tA43oEemjwpaBkaWY0Q" name="className" value="IBooleanEObjectExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tBI3oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8o5J1EemkbNOY_7-CZA" name="className" value="AndExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8pJJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> </constraints> </views> - <views xmi:id="_P83tBY3oEemjwpaBkaWY0Q" elementMultiplicity="-1" name="Multiple IBooleanEObjectExpression" sections="_QwWYQY3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tTI3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tBo3oEemjwpaBkaWY0Q" name="isMultipleIBooleanEObjectExpression"> + <views xmi:id="_DFo8pZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple AndExpression" sections="_Hm_AoZJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo88JJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8ppJ1EemkbNOY_7-CZA" name="isMultipleAndExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tB43oEemjwpaBkaWY0Q" name="className" value="IBooleanEObjectExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tCI3oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8p5J1EemkbNOY_7-CZA" name="className" value="AndExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8qJJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> </constraints> </views> - <views xmi:id="_P83tCY3oEemjwpaBkaWY0Q" name="Single OrExpression" sections="_QwW_UI3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tSY3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tCo3oEemjwpaBkaWY0Q" name="isSingleOrExpression"> + <views xmi:id="_DFo8qZJ1EemkbNOY_7-CZA" name="Single AbstractSingleBooleanEObjectExpressionOwnedExpression" sections="_Hm_AopJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo88pJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8qpJ1EemkbNOY_7-CZA" name="isSingleAbstractSingleBooleanEObjectExpressionOwnedExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tC43oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tDI3oEemjwpaBkaWY0Q" name="className" value="OrExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8q5J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8rJJ1EemkbNOY_7-CZA" name="className" value="AbstractSingleBooleanEObjectExpressionOwnedExpression"/> </constraints> </views> - <views xmi:id="_P83tDY3oEemjwpaBkaWY0Q" elementMultiplicity="-1" name="Multiple OrExpression" sections="_QwW_UY3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tSY3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tDo3oEemjwpaBkaWY0Q" name="isMultipleOrExpression"> + <views xmi:id="_DFo8rZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple AbstractSingleBooleanEObjectExpressionOwnedExpression" sections="_Hm_nsJJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo88pJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8rpJ1EemkbNOY_7-CZA" name="isMultipleAbstractSingleBooleanEObjectExpressionOwnedExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tD43oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tEI3oEemjwpaBkaWY0Q" name="className" value="OrExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8r5J1EemkbNOY_7-CZA" name="className" value="AbstractSingleBooleanEObjectExpressionOwnedExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8sJJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> </constraints> </views> - <views xmi:id="_P83tEY3oEemjwpaBkaWY0Q" name="Single AndExpression" sections="_QwW_Uo3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tTo3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tEo3oEemjwpaBkaWY0Q" name="isSingleAndExpression"> + <views xmi:id="_DFo8sZJ1EemkbNOY_7-CZA" name="Single AbstractSingleBooleanEObjectExpressionReferenceExpression" sections="_Hm_nsZJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo89JJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8spJ1EemkbNOY_7-CZA" name="isSingleAbstractSingleBooleanEObjectExpressionReferenceExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tE43oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tFI3oEemjwpaBkaWY0Q" name="className" value="AndExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8s5J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8tJJ1EemkbNOY_7-CZA" name="className" value="AbstractSingleBooleanEObjectExpressionReferenceExpression"/> </constraints> </views> - <views xmi:id="_P83tFY3oEemjwpaBkaWY0Q" elementMultiplicity="-1" name="Multiple AndExpression" sections="_QwXmYI3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tTo3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tFo3oEemjwpaBkaWY0Q" name="isMultipleAndExpression"> + <views xmi:id="_DFo8tZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple AbstractSingleBooleanEObjectExpressionReferenceExpression" sections="_Hm_nspJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo89JJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8tpJ1EemkbNOY_7-CZA" name="isMultipleAbstractSingleBooleanEObjectExpressionReferenceExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tF43oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tGI3oEemjwpaBkaWY0Q" name="className" value="AndExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8t5J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8uJJ1EemkbNOY_7-CZA" name="className" value="AbstractSingleBooleanEObjectExpressionReferenceExpression"/> </constraints> </views> - <views xmi:id="_P83tGY3oEemjwpaBkaWY0Q" name="Single NotExpression" sections="_QwXmYY3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tUY3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tGo3oEemjwpaBkaWY0Q" name="isSingleNotExpression"> + <views xmi:id="_DFo8uZJ1EemkbNOY_7-CZA" name="Single NotExpression" sections="_HnAOwJJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo88ZJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8upJ1EemkbNOY_7-CZA" name="isSingleNotExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tG43oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tHI3oEemjwpaBkaWY0Q" name="className" value="NotExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8u5J1EemkbNOY_7-CZA" name="className" value="NotExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8vJJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> </constraints> </views> - <views xmi:id="_P83tHY3oEemjwpaBkaWY0Q" elementMultiplicity="-1" name="Multiple NotExpression" sections="_QwYNcI3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tUY3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tHo3oEemjwpaBkaWY0Q" name="isMultipleNotExpression"> + <views xmi:id="_DFo8vZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple NotExpression" sections="_HnAOwZJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo88ZJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8vpJ1EemkbNOY_7-CZA" name="isMultipleNotExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tH43oEemjwpaBkaWY0Q" name="className" value="NotExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tII3oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8v5J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8wJJ1EemkbNOY_7-CZA" name="className" value="NotExpression"/> </constraints> </views> - <views xmi:id="_P83tIY3oEemjwpaBkaWY0Q" name="Single LiteralTrueExpression" sections="_QwYNcY3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tVI3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tIo3oEemjwpaBkaWY0Q" name="isSingleLiteralTrueExpression"> + <views xmi:id="_DFo8wZJ1EemkbNOY_7-CZA" name="Single LiteralTrueExpression" sections="_HnAOwpJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo89pJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8wpJ1EemkbNOY_7-CZA" name="isSingleLiteralTrueExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tI43oEemjwpaBkaWY0Q" name="className" value="LiteralTrueExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tJI3oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8w5J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8xJJ1EemkbNOY_7-CZA" name="className" value="LiteralTrueExpression"/> </constraints> </views> - <views xmi:id="_P83tJY3oEemjwpaBkaWY0Q" elementMultiplicity="-1" name="Multiple LiteralTrueExpression" sections="_QwYNco3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tVI3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tJo3oEemjwpaBkaWY0Q" name="isMultipleLiteralTrueExpression"> + <views xmi:id="_DFo8xZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple LiteralTrueExpression" sections="_HnA10JJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo89pJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8xpJ1EemkbNOY_7-CZA" name="isMultipleLiteralTrueExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tJ43oEemjwpaBkaWY0Q" name="className" value="LiteralTrueExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tKI3oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8x5J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8yJJ1EemkbNOY_7-CZA" name="className" value="LiteralTrueExpression"/> </constraints> </views> - <views xmi:id="_P83tKY3oEemjwpaBkaWY0Q" name="Single LiteralFalseExpression" sections="_QwY0gI3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tVY3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tKo3oEemjwpaBkaWY0Q" name="isSingleLiteralFalseExpression"> + <views xmi:id="_DFo8yZJ1EemkbNOY_7-CZA" name="Single LiteralFalseExpression" sections="_HnA10ZJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo895J1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8ypJ1EemkbNOY_7-CZA" name="isSingleLiteralFalseExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tK43oEemjwpaBkaWY0Q" name="className" value="LiteralFalseExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tLI3oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8y5J1EemkbNOY_7-CZA" name="className" value="LiteralFalseExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8zJJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> </constraints> </views> - <views xmi:id="_P83tLY3oEemjwpaBkaWY0Q" elementMultiplicity="-1" name="Multiple LiteralFalseExpression" sections="_QwY0gY3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tVY3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tLo3oEemjwpaBkaWY0Q" name="isMultipleLiteralFalseExpression"> + <views xmi:id="_DFo8zZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple LiteralFalseExpression" sections="_HnA10pJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo895J1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo8zpJ1EemkbNOY_7-CZA" name="isMultipleLiteralFalseExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tL43oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tMI3oEemjwpaBkaWY0Q" name="className" value="LiteralFalseExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo8z5J1EemkbNOY_7-CZA" name="className" value="LiteralFalseExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo80JJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> </constraints> </views> - <views xmi:id="_P83tMY3oEemjwpaBkaWY0Q" name="Single ReferenceBooleanExpression" sections="_QwZbkI3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tVo3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tMo3oEemjwpaBkaWY0Q" name="isSingleReferenceBooleanExpression"> + <views xmi:id="_DFo80ZJ1EemkbNOY_7-CZA" name="Single ReferenceBooleanExpression" sections="_HnBc4JJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo8-JJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo80pJ1EemkbNOY_7-CZA" name="isSingleReferenceBooleanExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tM43oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tNI3oEemjwpaBkaWY0Q" name="className" value="ReferenceBooleanExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo805J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo81JJ1EemkbNOY_7-CZA" name="className" value="ReferenceBooleanExpression"/> </constraints> </views> - <views xmi:id="_P83tNY3oEemjwpaBkaWY0Q" elementMultiplicity="-1" name="Multiple ReferenceBooleanExpression" sections="_QwZbkY3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tVo3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tNo3oEemjwpaBkaWY0Q" name="isMultipleReferenceBooleanExpression"> + <views xmi:id="_DFo81ZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple ReferenceBooleanExpression" sections="_HnBc4ZJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo8-JJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo81pJ1EemkbNOY_7-CZA" name="isMultipleReferenceBooleanExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tN43oEemjwpaBkaWY0Q" name="className" value="ReferenceBooleanExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tOI3oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo815J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo82JJ1EemkbNOY_7-CZA" name="className" value="ReferenceBooleanExpression"/> </constraints> </views> - <views xmi:id="_P83tOY3oEemjwpaBkaWY0Q" name="Single SingleEAttributeValueEqualityExpression" sections="_QwZbko3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tWI3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tOo3oEemjwpaBkaWY0Q" name="isSingleSingleEAttributeValueEqualityExpression"> + <views xmi:id="_DFo82ZJ1EemkbNOY_7-CZA" name="Single SingleEAttributeValueEqualityExpression" sections="_HnBc4pJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo8-ZJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo82pJ1EemkbNOY_7-CZA" name="isSingleSingleEAttributeValueEqualityExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tO43oEemjwpaBkaWY0Q" name="className" value="SingleEAttributeValueEqualityExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tPI3oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo825J1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo83JJ1EemkbNOY_7-CZA" name="className" value="SingleEAttributeValueEqualityExpression"/> </constraints> </views> - <views xmi:id="_P83tPY3oEemjwpaBkaWY0Q" elementMultiplicity="-1" name="Multiple SingleEAttributeValueEqualityExpression" sections="_QwaCoI3oEemjwpaBkaWY0Q" automaticContext="true" datacontexts="_P83tWI3oEemjwpaBkaWY0Q"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_P83tPo3oEemjwpaBkaWY0Q" name="isMultipleSingleEAttributeValueEqualityExpression"> + <views xmi:id="_DFo83ZJ1EemkbNOY_7-CZA" elementMultiplicity="-1" name="Multiple SingleEAttributeValueEqualityExpression" sections="_HnCD8JJ1EemkbNOY_7-CZA" automaticContext="true" datacontexts="_DFo8-ZJ1EemkbNOY_7-CZA"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_DFo83pJ1EemkbNOY_7-CZA" name="isMultipleSingleEAttributeValueEqualityExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tP43oEemjwpaBkaWY0Q" name="className" value="SingleEAttributeValueEqualityExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_P83tQI3oEemjwpaBkaWY0Q" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo835J1EemkbNOY_7-CZA" name="className" value="SingleEAttributeValueEqualityExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_DFo84JJ1EemkbNOY_7-CZA" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/> </constraints> </views> - <dataContexts xmi:id="_P83tQY3oEemjwpaBkaWY0Q" name="expressions" label="expressions"> - <elements xmi:id="_P83tQo3oEemjwpaBkaWY0Q" name="IBasicExpressionElement"> - <properties xmi:id="_P83tQ43oEemjwpaBkaWY0Q" name="name"/> - <properties xmi:id="_P83tRI3oEemjwpaBkaWY0Q" name="description"/> + <dataContexts xmi:id="_DFo84ZJ1EemkbNOY_7-CZA" name="expressions" label="expressions"> + <elements xmi:id="_DFo84pJ1EemkbNOY_7-CZA" name="IBasicExpressionElement"> + <properties xmi:id="_DFo845J1EemkbNOY_7-CZA" name="name"/> + <properties xmi:id="_DFo85JJ1EemkbNOY_7-CZA" name="description"/> </elements> - <elements xmi:id="_P83tRY3oEemjwpaBkaWY0Q" name="IExpression" supertypes="_P83tQo3oEemjwpaBkaWY0Q"/> - <elements xmi:id="_P83tRo3oEemjwpaBkaWY0Q" name="ExpressionCatalog" supertypes="_P83tQo3oEemjwpaBkaWY0Q"> - <properties xmi:id="_P83tR43oEemjwpaBkaWY0Q" name="expressions" type="Reference" multiplicity="-1"/> + <elements xmi:id="_DFo85ZJ1EemkbNOY_7-CZA" name="IExpression" supertypes="_DFo84pJ1EemkbNOY_7-CZA"/> + <elements xmi:id="_DFo85pJ1EemkbNOY_7-CZA" name="ExpressionCatalog" supertypes="_DFo84pJ1EemkbNOY_7-CZA"> + <properties xmi:id="_DFo855J1EemkbNOY_7-CZA" name="expressions" type="Reference" multiplicity="-1"/> </elements> - <elements xsi:type="contexts:DataContextPackage" xmi:id="_P83tSI3oEemjwpaBkaWY0Q" name="booleanexpressions"> - <elements xmi:id="_P83tSY3oEemjwpaBkaWY0Q" name="OrExpression" supertypes="_P83tTI3oEemjwpaBkaWY0Q"> - <properties xmi:id="_P83tSo3oEemjwpaBkaWY0Q" name="ownedExpressions" type="Reference" multiplicity="-1"/> - <properties xmi:id="_P83tS43oEemjwpaBkaWY0Q" name="referencedExpressions" type="Reference" multiplicity="-1"/> + <elements xsi:type="contexts:DataContextPackage" xmi:id="_DFo86JJ1EemkbNOY_7-CZA" name="booleanexpressions"> + <elements xmi:id="_DFo86ZJ1EemkbNOY_7-CZA" name="OrExpression" supertypes="_DFo87pJ1EemkbNOY_7-CZA _DFo86pJ1EemkbNOY_7-CZA"/> + <elements xmi:id="_DFo86pJ1EemkbNOY_7-CZA" name="AbtractMultiBooleanEObjectExpressionsOwnedExpression" supertypes="_DFo87JJ1EemkbNOY_7-CZA"> + <properties xmi:id="_DFo865J1EemkbNOY_7-CZA" name="ownedExpressions" type="Reference" multiplicity="-1"/> </elements> - <elements xmi:id="_P83tTI3oEemjwpaBkaWY0Q" name="IBooleanEObjectExpression" supertypes="_P83tTY3oEemjwpaBkaWY0Q"/> - <elements xmi:id="_P83tTY3oEemjwpaBkaWY0Q" name="IBooleanExpression" supertypes="_P83tRY3oEemjwpaBkaWY0Q"/> - <elements xmi:id="_P83tTo3oEemjwpaBkaWY0Q" name="AndExpression" supertypes="_P83tTI3oEemjwpaBkaWY0Q"> - <properties xmi:id="_P83tT43oEemjwpaBkaWY0Q" name="ownedExpressions" type="Reference" multiplicity="-1"/> - <properties xmi:id="_P83tUI3oEemjwpaBkaWY0Q" name="referencedExpressions" type="Reference" multiplicity="-1"/> + <elements xmi:id="_DFo87JJ1EemkbNOY_7-CZA" name="IBooleanEObjectExpression" supertypes="_DFo87ZJ1EemkbNOY_7-CZA"/> + <elements xmi:id="_DFo87ZJ1EemkbNOY_7-CZA" name="IBooleanExpression" supertypes="_DFo85ZJ1EemkbNOY_7-CZA"/> + <elements xmi:id="_DFo87pJ1EemkbNOY_7-CZA" name="AbstractMultiBooleanEObjectExpressionsReferenceExpression" supertypes="_DFo87JJ1EemkbNOY_7-CZA"> + <properties xmi:id="_DFo875J1EemkbNOY_7-CZA" name="referencedExpressions" type="Reference" multiplicity="-1"/> </elements> - <elements xmi:id="_P83tUY3oEemjwpaBkaWY0Q" name="NotExpression" supertypes="_P83tTI3oEemjwpaBkaWY0Q"> - <properties xmi:id="_P83tUo3oEemjwpaBkaWY0Q" name="ownedExpression" type="Reference"/> - <properties xmi:id="_P83tU43oEemjwpaBkaWY0Q" name="referencedExpression" type="Reference"/> + <elements xmi:id="_DFo88JJ1EemkbNOY_7-CZA" name="AndExpression" supertypes="_DFo87pJ1EemkbNOY_7-CZA _DFo86pJ1EemkbNOY_7-CZA"/> + <elements xmi:id="_DFo88ZJ1EemkbNOY_7-CZA" name="NotExpression" supertypes="_DFo88pJ1EemkbNOY_7-CZA _DFo89JJ1EemkbNOY_7-CZA"/> + <elements xmi:id="_DFo88pJ1EemkbNOY_7-CZA" name="AbstractSingleBooleanEObjectExpressionOwnedExpression" supertypes="_DFo87JJ1EemkbNOY_7-CZA"> + <properties xmi:id="_DFo885J1EemkbNOY_7-CZA" name="ownedExpression" type="Reference"/> </elements> - <elements xmi:id="_P83tVI3oEemjwpaBkaWY0Q" name="LiteralTrueExpression" supertypes="_P83tTI3oEemjwpaBkaWY0Q"/> - <elements xmi:id="_P83tVY3oEemjwpaBkaWY0Q" name="LiteralFalseExpression" supertypes="_P83tTI3oEemjwpaBkaWY0Q"/> - <elements xmi:id="_P83tVo3oEemjwpaBkaWY0Q" name="ReferenceBooleanExpression" supertypes="_P83tTI3oEemjwpaBkaWY0Q"> - <properties xmi:id="_P83tV43oEemjwpaBkaWY0Q" name="referencedExpression" type="Reference"/> + <elements xmi:id="_DFo89JJ1EemkbNOY_7-CZA" name="AbstractSingleBooleanEObjectExpressionReferenceExpression" supertypes="_DFo87JJ1EemkbNOY_7-CZA"> + <properties xmi:id="_DFo89ZJ1EemkbNOY_7-CZA" name="referencedExpression" type="Reference"/> </elements> - <elements xmi:id="_P83tWI3oEemjwpaBkaWY0Q" name="SingleEAttributeValueEqualityExpression" supertypes="_P83tTI3oEemjwpaBkaWY0Q"> - <properties xmi:id="_P83tWY3oEemjwpaBkaWY0Q" name="eAttribute" type="Reference" description="The eAttribute to check." multiplicity="1"/> - <properties xmi:id="_P83tWo3oEemjwpaBkaWY0Q" name="expectedValue" description="The expected value for the EAttribute."/> + <elements xmi:id="_DFo89pJ1EemkbNOY_7-CZA" name="LiteralTrueExpression" supertypes="_DFo87JJ1EemkbNOY_7-CZA"/> + <elements xmi:id="_DFo895J1EemkbNOY_7-CZA" name="LiteralFalseExpression" supertypes="_DFo87JJ1EemkbNOY_7-CZA"/> + <elements xmi:id="_DFo8-JJ1EemkbNOY_7-CZA" name="ReferenceBooleanExpression" supertypes="_DFo89JJ1EemkbNOY_7-CZA"/> + <elements xmi:id="_DFo8-ZJ1EemkbNOY_7-CZA" name="SingleEAttributeValueEqualityExpression" supertypes="_DFo87JJ1EemkbNOY_7-CZA"> + <properties xmi:id="_DFo8-pJ1EemkbNOY_7-CZA" name="eAttribute" type="Reference" description="The eAttribute to check."/> + <properties xmi:id="_DFo8-5J1EemkbNOY_7-CZA" name="expectedValue" description="The expected value for the EAttribute."/> </elements> </elements> <modelElementFactory href="Environment.xmi#//@modelElementFactories.0"/> diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleAbstractMultiBooleanEObjectExpressionsReferenceExpression.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleAbstractMultiBooleanEObjectExpressionsReferenceExpression.xwt new file mode 100755 index 00000000000..e29bdbb8542 --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleAbstractMultiBooleanEObjectExpressionsReferenceExpression.xwt @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Composite xmlns="http://www.eclipse.org/xwt/presentation" + xmlns:j="clr-namespace:java.lang" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:x="http://www.eclipse.org/xwt"> + <Composite.layout> + <ppel:PropertiesLayout></ppel:PropertiesLayout> + </Composite.layout> +</Composite>
\ No newline at end of file diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleAbstractSingleBooleanEObjectExpressionOwnedExpression.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleAbstractSingleBooleanEObjectExpressionOwnedExpression.xwt new file mode 100755 index 00000000000..e29bdbb8542 --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleAbstractSingleBooleanEObjectExpressionOwnedExpression.xwt @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Composite xmlns="http://www.eclipse.org/xwt/presentation" + xmlns:j="clr-namespace:java.lang" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:x="http://www.eclipse.org/xwt"> + <Composite.layout> + <ppel:PropertiesLayout></ppel:PropertiesLayout> + </Composite.layout> +</Composite>
\ No newline at end of file diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleAbstractSingleBooleanEObjectExpressionReferenceExpression.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleAbstractSingleBooleanEObjectExpressionReferenceExpression.xwt new file mode 100755 index 00000000000..e29bdbb8542 --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleAbstractSingleBooleanEObjectExpressionReferenceExpression.xwt @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Composite xmlns="http://www.eclipse.org/xwt/presentation" + xmlns:j="clr-namespace:java.lang" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:x="http://www.eclipse.org/xwt"> + <Composite.layout> + <ppel:PropertiesLayout></ppel:PropertiesLayout> + </Composite.layout> +</Composite>
\ No newline at end of file diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleAbtractMultiBooleanEObjectExpressionsOwnedExpression.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleAbtractMultiBooleanEObjectExpressionsOwnedExpression.xwt new file mode 100755 index 00000000000..e29bdbb8542 --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/MultipleAbtractMultiBooleanEObjectExpressionsOwnedExpression.xwt @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Composite xmlns="http://www.eclipse.org/xwt/presentation" + xmlns:j="clr-namespace:java.lang" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:x="http://www.eclipse.org/xwt"> + <Composite.layout> + <ppel:PropertiesLayout></ppel:PropertiesLayout> + </Composite.layout> +</Composite>
\ No newline at end of file diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAbstractMultiBooleanEObjectExpressionsReferenceExpression.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAbstractMultiBooleanEObjectExpressionsReferenceExpression.xwt new file mode 100755 index 00000000000..bfb4e317c86 --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAbstractMultiBooleanEObjectExpressionsReferenceExpression.xwt @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Composite xmlns="http://www.eclipse.org/xwt/presentation" + xmlns:j="clr-namespace:java.lang" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:x="http://www.eclipse.org/xwt"> + <Composite.layout> + <ppel:PropertiesLayout></ppel:PropertiesLayout> + </Composite.layout> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <ppe:StringEditor input="{Binding}" + property="expressions:IBasicExpressionElement:name"></ppe:StringEditor> + <ppe:StringEditor input="{Binding}" + property="expressions:IBasicExpressionElement:description"></ppe:StringEditor> + </Composite> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <ppe:MultiReference input="{Binding}" + property="expressions:booleanexpressions:AbstractMultiBooleanEObjectExpressionsReferenceExpression:referencedExpressions"></ppe:MultiReference> + </Composite> +</Composite>
\ No newline at end of file diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAbstractSingleBooleanEObjectExpressionOwnedExpression.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAbstractSingleBooleanEObjectExpressionOwnedExpression.xwt new file mode 100755 index 00000000000..da7341b800f --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAbstractSingleBooleanEObjectExpressionOwnedExpression.xwt @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Composite xmlns="http://www.eclipse.org/xwt/presentation" + xmlns:j="clr-namespace:java.lang" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:x="http://www.eclipse.org/xwt"> + <Composite.layout> + <ppel:PropertiesLayout></ppel:PropertiesLayout> + </Composite.layout> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <ppe:StringEditor input="{Binding}" + property="expressions:IBasicExpressionElement:name"></ppe:StringEditor> + <ppe:StringEditor input="{Binding}" + property="expressions:IBasicExpressionElement:description"></ppe:StringEditor> + </Composite> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <ppe:ReferenceDialog input="{Binding}" + property="expressions:booleanexpressions:AbstractSingleBooleanEObjectExpressionOwnedExpression:ownedExpression"></ppe:ReferenceDialog> + </Composite> +</Composite>
\ No newline at end of file diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAbstractSingleBooleanEObjectExpressionReferenceExpression.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAbstractSingleBooleanEObjectExpressionReferenceExpression.xwt new file mode 100755 index 00000000000..0a76d3dd99b --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAbstractSingleBooleanEObjectExpressionReferenceExpression.xwt @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Composite xmlns="http://www.eclipse.org/xwt/presentation" + xmlns:j="clr-namespace:java.lang" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:x="http://www.eclipse.org/xwt"> + <Composite.layout> + <ppel:PropertiesLayout></ppel:PropertiesLayout> + </Composite.layout> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <ppe:StringEditor input="{Binding}" + property="expressions:IBasicExpressionElement:name"></ppe:StringEditor> + <ppe:StringEditor input="{Binding}" + property="expressions:IBasicExpressionElement:description"></ppe:StringEditor> + </Composite> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <ppe:ReferenceDialog input="{Binding}" + property="expressions:booleanexpressions:AbstractSingleBooleanEObjectExpressionReferenceExpression:referencedExpression"></ppe:ReferenceDialog> + </Composite> +</Composite>
\ No newline at end of file diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAbtractMultiBooleanEObjectExpressionsOwnedExpression.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAbtractMultiBooleanEObjectExpressionsOwnedExpression.xwt new file mode 100755 index 00000000000..dbeae0a9311 --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAbtractMultiBooleanEObjectExpressionsOwnedExpression.xwt @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Composite xmlns="http://www.eclipse.org/xwt/presentation" + xmlns:j="clr-namespace:java.lang" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:x="http://www.eclipse.org/xwt"> + <Composite.layout> + <ppel:PropertiesLayout></ppel:PropertiesLayout> + </Composite.layout> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <ppe:StringEditor input="{Binding}" + property="expressions:IBasicExpressionElement:name"></ppe:StringEditor> + <ppe:StringEditor input="{Binding}" + property="expressions:IBasicExpressionElement:description"></ppe:StringEditor> + </Composite> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> + </Composite.layout> + <ppe:MultiReference input="{Binding}" + property="expressions:booleanexpressions:AbtractMultiBooleanEObjectExpressionsOwnedExpression:ownedExpressions"></ppe:MultiReference> + </Composite> +</Composite>
\ No newline at end of file diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAndExpression.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAndExpression.xwt index d912faa6885..57059b4f8e7 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAndExpression.xwt +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleAndExpression.xwt @@ -21,8 +21,8 @@ <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> </Composite.layout> <ppe:MultiReference input="{Binding}" - property="expressions:booleanexpressions:AndExpression:ownedExpressions"></ppe:MultiReference> + property="expressions:booleanexpressions:AbtractMultiBooleanEObjectExpressionsOwnedExpression:ownedExpressions"></ppe:MultiReference> <ppe:MultiReference input="{Binding}" - property="expressions:booleanexpressions:AndExpression:referencedExpressions"></ppe:MultiReference> + property="expressions:booleanexpressions:AbstractMultiBooleanEObjectExpressionsReferenceExpression:referencedExpressions"></ppe:MultiReference> </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleExpressionCatalog.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleExpressionCatalog.xwt index 4e9a79151d8..43ce2d1304f 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleExpressionCatalog.xwt +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleExpressionCatalog.xwt @@ -16,11 +16,4 @@ <ppe:StringEditor input="{Binding}" property="expressions:IBasicExpressionElement:description"></ppe:StringEditor> </Composite> - <Composite> - <Composite.layout> - <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> - </Composite.layout> - <ppe:MultiReference input="{Binding}" - property="expressions:ExpressionCatalog:expressions"></ppe:MultiReference> - </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleNotExpression.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleNotExpression.xwt index 2ff0481e731..a9cd7c9f537 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleNotExpression.xwt +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleNotExpression.xwt @@ -21,8 +21,8 @@ <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> </Composite.layout> <ppe:ReferenceDialog input="{Binding}" - property="expressions:booleanexpressions:NotExpression:ownedExpression"></ppe:ReferenceDialog> + property="expressions:booleanexpressions:AbstractSingleBooleanEObjectExpressionOwnedExpression:ownedExpression"></ppe:ReferenceDialog> <ppe:ReferenceDialog input="{Binding}" - property="expressions:booleanexpressions:NotExpression:referencedExpression"></ppe:ReferenceDialog> + property="expressions:booleanexpressions:AbstractSingleBooleanEObjectExpressionReferenceExpression:referencedExpression"></ppe:ReferenceDialog> </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleOrExpression.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleOrExpression.xwt index 93eb1364f37..57059b4f8e7 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleOrExpression.xwt +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleOrExpression.xwt @@ -21,8 +21,8 @@ <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> </Composite.layout> <ppe:MultiReference input="{Binding}" - property="expressions:booleanexpressions:OrExpression:ownedExpressions"></ppe:MultiReference> + property="expressions:booleanexpressions:AbtractMultiBooleanEObjectExpressionsOwnedExpression:ownedExpressions"></ppe:MultiReference> <ppe:MultiReference input="{Binding}" - property="expressions:booleanexpressions:OrExpression:referencedExpressions"></ppe:MultiReference> + property="expressions:booleanexpressions:AbstractMultiBooleanEObjectExpressionsReferenceExpression:referencedExpressions"></ppe:MultiReference> </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleReferenceBooleanExpression.xwt b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleReferenceBooleanExpression.xwt index 7335b0f960a..0a76d3dd99b 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleReferenceBooleanExpression.xwt +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/ui/SingleReferenceBooleanExpression.xwt @@ -21,6 +21,6 @@ <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> </Composite.layout> <ppe:ReferenceDialog input="{Binding}" - property="expressions:booleanexpressions:ReferenceBooleanExpression:referencedExpression"></ppe:ReferenceDialog> + property="expressions:booleanexpressions:AbstractSingleBooleanEObjectExpressionReferenceExpression:referencedExpression"></ppe:ReferenceDialog> </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/src/org/eclipse/papyrus/infra/emf/expressions/properties/modelelements/ReferenceBooleanEObjectExpressionModelElement.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/src/org/eclipse/papyrus/infra/emf/expressions/properties/modelelements/ReferenceBooleanEObjectExpressionModelElement.java index 7869bc263b8..26ee389c9e8 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/src/org/eclipse/papyrus/infra/emf/expressions/properties/modelelements/ReferenceBooleanEObjectExpressionModelElement.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/src/org/eclipse/papyrus/infra/emf/expressions/properties/modelelements/ReferenceBooleanEObjectExpressionModelElement.java @@ -49,7 +49,7 @@ public class ReferenceBooleanEObjectExpressionModelElement extends EMFModelEleme } /** - * + * * @see org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement#getContentProvider(java.lang.String) * * @param propertyPath @@ -57,8 +57,8 @@ public class ReferenceBooleanEObjectExpressionModelElement extends EMFModelEleme */ @Override public IStaticContentProvider getContentProvider(final String propertyPath) { - if (BooleanExpressionsPackage.eINSTANCE.getReferenceBooleanExpression_ReferencedExpression().getName().equals(propertyPath)) { - return new ExpressionCatalogContentProvider(BooleanExpressionsPackage.eINSTANCE.getReferenceBooleanExpression_ReferencedExpression()); + if (BooleanExpressionsPackage.eINSTANCE.getAbstractMultiBooleanEObjectExpressionsReferenceExpression_ReferencedExpressions().getName().equals(propertyPath)) { + return new ExpressionCatalogContentProvider(BooleanExpressionsPackage.eINSTANCE.getAbstractMultiBooleanEObjectExpressionsReferenceExpression_ReferencedExpressions()); } return super.getContentProvider(propertyPath); } diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/custom.css b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/custom.css index de67f1cf83a..0403ad7890e 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/custom.css +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/custom.css @@ -16,4 +16,16 @@ Association > Label:targetRole { Association > Label:name { visible:false; +} + +Association { + routing:Rectilinear; +} + +InterfaceRealization { + routing:Rectilinear; +} + +Generalization { + routing:Rectilinear; }
\ No newline at end of file diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.ecore b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.ecore index b5efbf2e369..7493cfb1c9c 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.ecore +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.ecore @@ -52,19 +52,16 @@ <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML"> <details key="originalName" value="BooleanExpressions"/> </eAnnotations> - <eClassifiers xsi:type="ecore:EClass" name="OrExpression" eSuperTypes="#//booleanexpressions/IBooleanEObjectExpression"> + <eClassifiers xsi:type="ecore:EClass" name="OrExpression" eSuperTypes="#//booleanexpressions/AbstractMultiBooleanEObjectExpressionsReferenceExpression #//booleanexpressions/AbtractMultiBooleanEObjectExpressionsOwnedExpression"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Make an OR between all owned and referenced IBooleanExpressions.
If ownedExpressions.size()==0 and referencedExpressions.size()==0, we return FALSE
otherwize we return the OR between all owned and referenced expressions"/> </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="AbtractMultiBooleanEObjectExpressionsOwnedExpression" + abstract="true" eSuperTypes="#//booleanexpressions/IBooleanEObjectExpression"> <eStructuralFeatures xsi:type="ecore:EReference" name="ownedExpressions" ordered="false" upperBound="-1" eType="#//booleanexpressions/IBooleanEObjectExpression" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="referencedExpressions" - ordered="false" upperBound="-1" eType="#//booleanexpressions/IBooleanEObjectExpression"> - <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/expressions/multiBooleanExpressionsReference"/> - </eAnnotations> - </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="IBooleanEObjectExpression" abstract="true" interface="true"> @@ -87,30 +84,36 @@ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/> </eGenericSuperTypes> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="AndExpression" eSuperTypes="#//booleanexpressions/IBooleanEObjectExpression"> - <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="Make an AND between all owned and referenced IBooleanExpression.
If ownedExpressions.size()==0 and referencedExpressions.size()==0, we return TRUE
otherwize we return the OR between all owned and referenced expressions"/> - </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EReference" name="ownedExpressions" ordered="false" - upperBound="-1" eType="#//booleanexpressions/IBooleanEObjectExpression" - containment="true"/> + <eClassifiers xsi:type="ecore:EClass" name="AbstractMultiBooleanEObjectExpressionsReferenceExpression" + abstract="true" eSuperTypes="#//booleanexpressions/IBooleanEObjectExpression"> <eStructuralFeatures xsi:type="ecore:EReference" name="referencedExpressions" ordered="false" upperBound="-1" eType="#//booleanexpressions/IBooleanEObjectExpression"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/expressions/multiBooleanExpressionsReference"/> + <details key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/expressions/MultiBooleanEObjectExpressionsReferenceExpression/referencedExpressions"/> </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="NotExpression" eSuperTypes="#//booleanexpressions/IBooleanEObjectExpression"> + <eClassifiers xsi:type="ecore:EClass" name="AndExpression" eSuperTypes="#//booleanexpressions/AbstractMultiBooleanEObjectExpressionsReferenceExpression #//booleanexpressions/AbtractMultiBooleanEObjectExpressionsOwnedExpression"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Make an AND between all owned and referenced IBooleanExpression.
If ownedExpressions.size()==0 and referencedExpressions.size()==0, we return TRUE
otherwize we return the OR between all owned and referenced expressions"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="NotExpression" eSuperTypes="#//booleanexpressions/AbstractSingleBooleanEObjectExpressionOwnedExpression #//booleanexpressions/AbstractSingleBooleanEObjectExpressionReferenceExpression"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Make a not on an IBooleanExpression
If ownedExpression==NULL and referencedExpression==NULL we return FALSE
If ownedExpression<>NULL and referencedExpression<>NULL we return the result for ownedExpression. The referencedExpression is ignored
In other case we return the evaluation of the non NULL expression"/> </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="AbstractSingleBooleanEObjectExpressionOwnedExpression" + abstract="true" eSuperTypes="#//booleanexpressions/IBooleanEObjectExpression"> <eStructuralFeatures xsi:type="ecore:EReference" name="ownedExpression" ordered="false" eType="#//booleanexpressions/IBooleanEObjectExpression" containment="true"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="AbstractSingleBooleanEObjectExpressionReferenceExpression" + abstract="true" eSuperTypes="#//booleanexpressions/IBooleanEObjectExpression"> <eStructuralFeatures xsi:type="ecore:EReference" name="referencedExpression" ordered="false" eType="#//booleanexpressions/IBooleanEObjectExpression"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/expressions/singleBooleanExpressionReference"/> + <details key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/expressions/SingleBooleanEObjectExpressionReferenceExpression/referencedExpression"/> </eAnnotations> </eStructuralFeatures> </eClassifiers> @@ -124,13 +127,11 @@ <details key="documentation" value="Returns always false"/> </eAnnotations> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ReferenceBooleanExpression" eSuperTypes="#//booleanexpressions/IBooleanEObjectExpression"> + <eClassifiers xsi:type="ecore:EClass" name="ReferenceBooleanExpression" eSuperTypes="#//booleanexpressions/AbstractSingleBooleanEObjectExpressionReferenceExpression"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="This expression allows to reference an expression defined in another model.
If there is no expression referenced we return TRUE."/> <details key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/expressions/singleBooleanExpressionReference"/> </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EReference" name="referencedExpression" - ordered="false" eType="#//booleanexpressions/IBooleanEObjectExpression"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="SingleEAttributeValueEqualityExpression" eSuperTypes="#//booleanexpressions/IBooleanEObjectExpression"> diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.genmodel b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.genmodel index b69e4f03b2c..c22aee269d5 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.genmodel +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.genmodel @@ -56,27 +56,28 @@ basePackage="org.eclipse.papyrus.infra.emf.expressions" disposableProviderFactory="true" generateExampleClass="false" multipleEditorPages="false" generateModelWizard="false" extensibleProviderFactory="true" childCreationExtenders="true" ecorePackage="expressions.ecore#//booleanexpressions"> - <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressions/OrExpression"> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressions/OrExpression"/> + <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="expressions.ecore#//booleanexpressions/AbtractMultiBooleanEObjectExpressionsOwnedExpression"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" - createChild="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/OrExpression/ownedExpressions"/> - <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" - propertySortChoices="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/OrExpression/referencedExpressions"/> + createChild="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/AbtractMultiBooleanEObjectExpressionsOwnedExpression/ownedExpressions"/> </genClasses> <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="expressions.ecore#//booleanexpressions/IBooleanEObjectExpression"/> <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="expressions.ecore#//booleanexpressions/IBooleanExpression"> <genTypeParameters ecoreTypeParameter="expressions.ecore#//booleanexpressions/IBooleanExpression/IBooleanExpression_REDEFINED_CONTEXT_TYPE"/> </genClasses> - <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressions/AndExpression"> - <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" - createChild="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/AndExpression/ownedExpressions"/> + <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="expressions.ecore#//booleanexpressions/AbstractMultiBooleanEObjectExpressionsReferenceExpression"> <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" - propertySortChoices="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/AndExpression/referencedExpressions"/> + propertySortChoices="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/AbstractMultiBooleanEObjectExpressionsReferenceExpression/referencedExpressions"/> </genClasses> - <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressions/NotExpression"> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressions/AndExpression"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressions/NotExpression"/> + <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="expressions.ecore#//booleanexpressions/AbstractSingleBooleanEObjectExpressionOwnedExpression"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" - createChild="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/NotExpression/ownedExpression"/> + createChild="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/AbstractSingleBooleanEObjectExpressionOwnedExpression/ownedExpression"/> + </genClasses> + <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="expressions.ecore#//booleanexpressions/AbstractSingleBooleanEObjectExpressionReferenceExpression"> <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" - propertySortChoices="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/NotExpression/referencedExpression"/> + propertySortChoices="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/AbstractSingleBooleanEObjectExpressionReferenceExpression/referencedExpression"/> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressions/LiteralTrueExpression"/> <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressions/LiteralFalseExpression"/> @@ -84,8 +85,6 @@ <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/expressions/singleBooleanExpressionReference"/> </genAnnotations> - <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" - propertySortChoices="true" ecoreFeature="ecore:EReference expressions.ecore#//booleanexpressions/ReferenceBooleanExpression/referencedExpression"/> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="expressions.ecore#//booleanexpressions/SingleEAttributeValueEqualityExpression"> <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.notation b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.notation index 2be51c4db8f..8b0bf38c057 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.notation +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.notation @@ -223,6 +223,14 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_SollQBXiEee_D4EhwjboOQ" y="15"/> </children> <children xmi:type="notation:BasicCompartment" xmi:id="_SollQRXiEee_D4EhwjboOQ" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="__fjfYJHYEemkbNOY_7-CZA" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="expressions.uml#_OwPQoJHYEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="__fjfYZHYEemkbNOY_7-CZA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="__fjfYpHYEemkbNOY_7-CZA" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="expressions.uml#_CfNj4JHYEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="__fjfY5HYEemkbNOY_7-CZA"/> + </children> <styles xmi:type="notation:TitleStyle" xmi:id="_SollQhXiEee_D4EhwjboOQ"/> <styles xmi:type="notation:SortingStyle" xmi:id="_SollQxXiEee_D4EhwjboOQ"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_SollRBXiEee_D4EhwjboOQ"/> @@ -241,7 +249,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SollTxXiEee_D4EhwjboOQ"/> </children> <element xmi:type="uml:Class" href="expressions.uml#_WpVKMBVbEee_D4EhwjboOQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SokXIRXiEee_D4EhwjboOQ" x="120" y="480" width="323"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SokXIRXiEee_D4EhwjboOQ" x="220" y="1140" width="397" height="100"/> </children> <children xmi:type="notation:Shape" xmi:id="_SpF7kBXiEee_D4EhwjboOQ" type="Interface_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_SpGioBXiEee_D4EhwjboOQ" type="Interface_NameLabel"/> @@ -293,7 +301,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SqiGExXiEee_D4EhwjboOQ"/> </children> <element xmi:type="uml:Class" href="expressions.uml#_wcKe0BVKEee_D4EhwjboOQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SqiGARXiEee_D4EhwjboOQ" x="940" y="480" width="323"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SqiGARXiEee_D4EhwjboOQ" x="1740" y="920" width="397"/> </children> <children xmi:type="notation:Shape" xmi:id="_WV7ZsBXiEee_D4EhwjboOQ" type="Interface_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_WV7ZshXiEee_D4EhwjboOQ" type="Interface_NameLabel"/> @@ -327,6 +335,14 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_2Gg2dBXiEee_D4EhwjboOQ" y="15"/> </children> <children xmi:type="notation:BasicCompartment" xmi:id="_2Gg2dRXiEee_D4EhwjboOQ" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="__fi4UJHYEemkbNOY_7-CZA" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="expressions.uml#_CfNj4JHYEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="__fi4UZHYEemkbNOY_7-CZA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="__fi4UpHYEemkbNOY_7-CZA" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="expressions.uml#_OwPQoJHYEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="__fi4U5HYEemkbNOY_7-CZA"/> + </children> <styles xmi:type="notation:TitleStyle" xmi:id="_2GhdgBXiEee_D4EhwjboOQ"/> <styles xmi:type="notation:SortingStyle" xmi:id="_2GhdgRXiEee_D4EhwjboOQ"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_2GhdghXiEee_D4EhwjboOQ"/> @@ -345,7 +361,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2GhdjRXiEee_D4EhwjboOQ"/> </children> <element xmi:type="uml:Class" href="expressions.uml#_2GdzIBXiEee_D4EhwjboOQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2Gg2cRXiEee_D4EhwjboOQ" x="-280" y="480" width="323"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2Gg2cRXiEee_D4EhwjboOQ" x="-320" y="1140" width="397" height="100"/> </children> <children xmi:type="notation:Shape" xmi:id="_3NfFkBXiEee_D4EhwjboOQ" type="Class_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_3NfsoBXiEee_D4EhwjboOQ" type="Class_NameLabel"/> @@ -353,6 +369,14 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_3NfsohXiEee_D4EhwjboOQ" y="15"/> </children> <children xmi:type="notation:BasicCompartment" xmi:id="_3NfsoxXiEee_D4EhwjboOQ" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="__fjfZJHYEemkbNOY_7-CZA" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="expressions.uml#_gX8HIZHYEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="__fjfZZHYEemkbNOY_7-CZA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="__fkGcJHYEemkbNOY_7-CZA" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="expressions.uml#_ade64JHYEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="__fkGcZHYEemkbNOY_7-CZA"/> + </children> <styles xmi:type="notation:TitleStyle" xmi:id="_3NfspBXiEee_D4EhwjboOQ"/> <styles xmi:type="notation:SortingStyle" xmi:id="_3NfspRXiEee_D4EhwjboOQ"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_3NfsphXiEee_D4EhwjboOQ"/> @@ -371,7 +395,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3NfssRXiEee_D4EhwjboOQ"/> </children> <element xmi:type="uml:Class" href="expressions.uml#_3NcCQBXiEee_D4EhwjboOQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3NfFkRXiEee_D4EhwjboOQ" x="540" y="480" width="323"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3NfFkRXiEee_D4EhwjboOQ" x="720" y="1140" width="397" height="100"/> </children> <children xmi:type="notation:Shape" xmi:id="_scnHgBXjEee_D4EhwjboOQ" type="Class_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_scnukBXjEee_D4EhwjboOQ" type="Class_NameLabel"/> @@ -397,37 +421,37 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_scnuoRXjEee_D4EhwjboOQ"/> </children> <element xmi:type="uml:Class" href="expressions.uml#_sckEMBXjEee_D4EhwjboOQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_scnHgRXjEee_D4EhwjboOQ" x="1340" y="480" width="323"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_scnHgRXjEee_D4EhwjboOQ" x="2180" y="920" width="397"/> </children> <children xmi:type="notation:Shape" xmi:id="_GlZPUBn3EeeYEuQJkmbFAA" type="Comment_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_GlZ2YBn3EeeYEuQJkmbFAA" type="Comment_BodyLabel"/> <element xmi:type="uml:Comment" href="expressions.uml#_GlUW0Bn3EeeYEuQJkmbFAA"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GlZPURn3EeeYEuQJkmbFAA" x="-300" y="680" width="323" height="139"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GlZPURn3EeeYEuQJkmbFAA" x="-280" y="1340" width="323" height="139"/> </children> <children xmi:type="notation:Shape" xmi:id="_mKKmIBrSEeeJdcoPLKQK3g" type="Comment_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_mKKmIRrSEeeJdcoPLKQK3g" type="Comment_BodyLabel"/> <element xmi:type="uml:Comment" href="expressions.uml#_mKJYABrSEeeJdcoPLKQK3g"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKKmIhrSEeeJdcoPLKQK3g" x="120" y="680" width="323" height="139"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKKmIhrSEeeJdcoPLKQK3g" x="260" y="1340" width="323" height="139"/> </children> <children xmi:type="notation:Shape" xmi:id="_oD69ERrSEeeJdcoPLKQK3g" type="Comment_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_oD69EhrSEeeJdcoPLKQK3g" type="Comment_BodyLabel"/> <element xmi:type="uml:Comment" href="expressions.uml#_oD69EBrSEeeJdcoPLKQK3g"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oD69ExrSEeeJdcoPLKQK3g" x="540" y="682" width="323" height="139"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oD69ExrSEeeJdcoPLKQK3g" x="760" y="1360" width="323" height="139"/> </children> <children xmi:type="notation:Shape" xmi:id="_BxAmUBrTEeeJdcoPLKQK3g" type="Comment_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_BxAmURrTEeeJdcoPLKQK3g" type="Comment_BodyLabel"/> <element xmi:type="uml:Comment" href="expressions.uml#_Bw_YMBrTEeeJdcoPLKQK3g"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BxAmUhrTEeeJdcoPLKQK3g" x="940" y="680" width="323" height="139"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BxAmUhrTEeeJdcoPLKQK3g" x="1780" y="1140" width="323" height="139"/> </children> <children xmi:type="notation:Shape" xmi:id="_EmKOgBrTEeeJdcoPLKQK3g" type="Comment_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_EmKOgRrTEeeJdcoPLKQK3g" type="Comment_BodyLabel"/> <element xmi:type="uml:Comment" href="expressions.uml#_EmJncBrTEeeJdcoPLKQK3g"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmKOghrTEeeJdcoPLKQK3g" x="1340" y="680" width="323" height="139"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmKOghrTEeeJdcoPLKQK3g" x="2220" y="1140" width="323" height="139"/> </children> <children xmi:type="notation:Shape" xmi:id="_hcjLABrTEeeJdcoPLKQK3g" type="Comment_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_hcm1YBrTEeeJdcoPLKQK3g" type="Comment_BodyLabel"/> <element xmi:type="uml:Comment" href="expressions.uml#_hcgHsBrTEeeJdcoPLKQK3g"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hcjLARrTEeeJdcoPLKQK3g" x="1000" y="240"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hcjLARrTEeeJdcoPLKQK3g" x="1020" y="120"/> </children> <children xmi:type="notation:Shape" xmi:id="_oVDT4BrTEeeJdcoPLKQK3g" type="Class_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_oVDT4hrTEeeJdcoPLKQK3g" type="Class_NameLabel"/> @@ -435,6 +459,10 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_oVDT5BrTEeeJdcoPLKQK3g" y="15"/> </children> <children xmi:type="notation:BasicCompartment" xmi:id="_oVD68BrTEeeJdcoPLKQK3g" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="__fkGcpHYEemkbNOY_7-CZA" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="expressions.uml#_ade64JHYEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="__fkGc5HYEemkbNOY_7-CZA"/> + </children> <styles xmi:type="notation:TitleStyle" xmi:id="_oVD68RrTEeeJdcoPLKQK3g"/> <styles xmi:type="notation:SortingStyle" xmi:id="_oVD68hrTEeeJdcoPLKQK3g"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_oVD68xrTEeeJdcoPLKQK3g"/> @@ -453,12 +481,12 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oVD6_hrTEeeJdcoPLKQK3g"/> </children> <element xmi:type="uml:Class" href="expressions.uml#_oU_pgBrTEeeJdcoPLKQK3g"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oVDT4RrTEeeJdcoPLKQK3g" x="1740" y="480" width="323"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oVDT4RrTEeeJdcoPLKQK3g" x="1260" y="1140" width="397" height="100"/> </children> <children xmi:type="notation:Shape" xmi:id="_PMdCUBrUEeeJdcoPLKQK3g" type="Comment_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_PMdpYBrUEeeJdcoPLKQK3g" type="Comment_BodyLabel"/> <element xmi:type="uml:Comment" href="expressions.uml#_PMb0MBrUEeeJdcoPLKQK3g"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PMdCURrUEeeJdcoPLKQK3g" x="1740" y="680" width="323" height="139"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PMdCURrUEeeJdcoPLKQK3g" x="1300" y="1360" width="323" height="139"/> </children> <children xmi:type="notation:Shape" xmi:id="_yFTb0BtpEeeNbZVCoqtPGQ" type="Interface_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_yFTb0htpEeeNbZVCoqtPGQ" type="Interface_NameLabel"/> @@ -504,43 +532,132 @@ <element xmi:type="uml:Interface" href="expressions.uml#_yFQYgBtpEeeNbZVCoqtPGQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yFTb0RtpEeeNbZVCoqtPGQ" x="540" y="-40" width="323" height="100"/> </children> + <children xmi:type="notation:Shape" xmi:id="_RqnB8JHWEemkbNOY_7-CZA" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_RqqsUJHWEemkbNOY_7-CZA" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_RqqsUZHWEemkbNOY_7-CZA" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_RqqsUpHWEemkbNOY_7-CZA" y="15"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_RqqsU5HWEemkbNOY_7-CZA" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_Uff5gJHYEemkbNOY_7-CZA" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="expressions.uml#_CfNj4JHYEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Uff5gZHYEemkbNOY_7-CZA"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_RqqsVJHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_RqqsVZHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_RqqsVpHWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RqqsV5HWEemkbNOY_7-CZA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_RqqsWJHWEemkbNOY_7-CZA" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_RqqsWZHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_RqqsWpHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_RqqsW5HWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RqqsXJHWEemkbNOY_7-CZA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_RqqsXZHWEemkbNOY_7-CZA" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_RqqsXpHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_RqqsX5HWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_RqqsYJHWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RqqsYZHWEemkbNOY_7-CZA"/> + </children> + <element xmi:type="uml:Class" href="expressions.uml#_RqUHAJHWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RqnB8ZHWEemkbNOY_7-CZA" x="-318" y="920" width="397"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_fijCIJHWEemkbNOY_7-CZA" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_fijpMJHWEemkbNOY_7-CZA" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_fijpMZHWEemkbNOY_7-CZA" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_fijpMpHWEemkbNOY_7-CZA" y="15"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_fijpM5HWEemkbNOY_7-CZA" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_fJev8JHYEemkbNOY_7-CZA" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="expressions.uml#_ade64JHYEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_fJev8ZHYEemkbNOY_7-CZA"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_fijpNJHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_fijpNZHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_fijpNpHWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fijpN5HWEemkbNOY_7-CZA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_fijpOJHWEemkbNOY_7-CZA" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_fijpOZHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_fijpOpHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_fijpO5HWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fijpPJHWEemkbNOY_7-CZA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_fijpPZHWEemkbNOY_7-CZA" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_fijpPpHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_fijpP5HWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_fijpQJHWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fijpQZHWEemkbNOY_7-CZA"/> + </children> + <element xmi:type="uml:Class" href="expressions.uml#_fidikJHWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fijCIZHWEemkbNOY_7-CZA" x="1260" y="920" width="401"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_vbaYQJHWEemkbNOY_7-CZA" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_vbaYQpHWEemkbNOY_7-CZA" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_vbaYQ5HWEemkbNOY_7-CZA" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_vbaYRJHWEemkbNOY_7-CZA" y="15"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_vbaYRZHWEemkbNOY_7-CZA" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_kkg1QJHYEemkbNOY_7-CZA" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="expressions.uml#_gX8HIZHYEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_kkg1QZHYEemkbNOY_7-CZA"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_vbaYRpHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_vbaYR5HWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_vbaYSJHWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vbaYSZHWEemkbNOY_7-CZA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_vbaYSpHWEemkbNOY_7-CZA" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_vbaYS5HWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_vbaYTJHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_vbaYTZHWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vbaYTpHWEemkbNOY_7-CZA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_vba_UJHWEemkbNOY_7-CZA" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_vba_UZHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_vba_UpHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_vba_U5HWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vba_VJHWEemkbNOY_7-CZA"/> + </children> + <element xmi:type="uml:Class" href="expressions.uml#_vbWt4JHWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vbaYQZHWEemkbNOY_7-CZA" x="720" y="920" width="401"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_16FE0JHWEemkbNOY_7-CZA" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_16Fr4ZHWEemkbNOY_7-CZA" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_16Fr4pHWEemkbNOY_7-CZA" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_16Fr45HWEemkbNOY_7-CZA" y="15"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_16Fr5JHWEemkbNOY_7-CZA" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_UfhusJHYEemkbNOY_7-CZA" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="expressions.uml#_OwPQoJHYEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UfhusZHYEemkbNOY_7-CZA"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_16Fr5ZHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_16Fr5pHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_16Fr55HWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_16Fr6JHWEemkbNOY_7-CZA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_16Fr6ZHWEemkbNOY_7-CZA" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_16Fr6pHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_16Fr65HWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_16Fr7JHWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_16Fr7ZHWEemkbNOY_7-CZA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_16Fr7pHWEemkbNOY_7-CZA" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_16Fr75HWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_16Fr8JHWEemkbNOY_7-CZA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_16Fr8ZHWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_16Fr8pHWEemkbNOY_7-CZA"/> + </children> + <element xmi:type="uml:Class" href="expressions.uml#_16D2sJHWEemkbNOY_7-CZA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_16Fr4JHWEemkbNOY_7-CZA" x="220" y="920" width="401"/> + </children> <styles xmi:type="notation:StringValueStyle" xmi:id="_E-Du8RXiEee_D4EhwjboOQ" name="diagram_compatibility_version" stringValue="1.4.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_E-Du8hXiEee_D4EhwjboOQ"/> <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_E-Du8xXiEee_D4EhwjboOQ" diagramKindId="org.eclipse.papyrus.uml.diagram.class"> <owner xmi:type="uml:Package" href="expressions.uml#_0cNGMBXhEee_D4EhwjboOQ"/> </styles> <element xmi:type="uml:Package" href="expressions.uml#_0cNGMBXhEee_D4EhwjboOQ"/> - <edges xmi:type="notation:Connector" xmi:id="_SpXBUBXiEee_D4EhwjboOQ" type="Association_Edge" source="_SokXIBXiEee_D4EhwjboOQ" target="_SpF7kBXiEee_D4EhwjboOQ" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_SpXBUxXiEee_D4EhwjboOQ" type="Association_StereotypeLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TNXtUBXiEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_SpXBVBXiEee_D4EhwjboOQ" x="1" y="-18"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_SpXBVRXiEee_D4EhwjboOQ" type="Association_NameLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TNfCEBXiEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_SpXBVhXiEee_D4EhwjboOQ" x="1" y="19"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_SpXBVxXiEee_D4EhwjboOQ" type="Association_TargetRoleLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TNmW0BXiEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_SpXBWBXiEee_D4EhwjboOQ" x="2" y="-18"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_SpXoYBXiEee_D4EhwjboOQ" type="Association_SourceRoleLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TNuSoBXiEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_SpXoYRXiEee_D4EhwjboOQ" x="-2" y="19"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_SpXoYhXiEee_D4EhwjboOQ" type="Association_SourceMultiplicityLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TN21gBXiEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_SpXoYxXiEee_D4EhwjboOQ" x="2" y="18"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_SpXoZBXiEee_D4EhwjboOQ" type="Association_TargetMultiplicityLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_TN-KQBXiEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_SpXoZRXiEee_D4EhwjboOQ" x="-27" y="-40"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_SpXBURXiEee_D4EhwjboOQ"/> - <element xmi:type="uml:Association" href="expressions.uml#_cc5rUBVbEee_D4EhwjboOQ"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SpXBUhXiEee_D4EhwjboOQ" points="[280, 580, -643984, -643984]$[280, 620, -643984, -643984]$[-340, 620, -643984, -643984]$[-340, 260, -643984, -643984]$[540, 260, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TO8aoBXiEee_D4EhwjboOQ" id="(0.4953560371517028,1.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TO8aoRXiEee_D4EhwjboOQ" id="(0.0,0.4)"/> - </edges> <edges xmi:type="notation:Connector" xmi:id="_UNmbQBXiEee_D4EhwjboOQ" type="InterfaceRealization_Edge" source="_SqiGABXiEee_D4EhwjboOQ" target="_SpF7kBXiEee_D4EhwjboOQ" routing="Rectilinear"> <children xmi:type="notation:DecorationNode" xmi:id="_UNmbQxXiEee_D4EhwjboOQ" type="InterfaceRealization_StereotypeLabel"> <styles xmi:type="notation:BooleanValueStyle" xmi:id="_dXfX8BXiEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> @@ -552,9 +669,9 @@ </children> <styles xmi:type="notation:FontStyle" xmi:id="_UNmbQRXiEee_D4EhwjboOQ"/> <element xmi:type="uml:InterfaceRealization" href="expressions.uml#_5eytMBVbEee_D4EhwjboOQ"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UNmbQhXiEee_D4EhwjboOQ" points="[1100, 480, -643984, -643984]$[1100, 380, -643984, -643984]$[820, 380, -643984, -643984]$[820, 320, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dZm30BXiEee_D4EhwjboOQ" id="(0.5572755417956656,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dZm30RXiEee_D4EhwjboOQ" id="(0.8668730650154799,1.0)"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UNmbQhXiEee_D4EhwjboOQ" points="[2000, 920, -643984, -643984]$[2000, 260, -643984, -643984]$[863, 260, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dZm30BXiEee_D4EhwjboOQ" id="(0.5541561712846348,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dZm30RXiEee_D4EhwjboOQ" id="(1.0,0.4)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_WWh2oBXiEee_D4EhwjboOQ" type="Generalization_Edge" source="_SpF7kBXiEee_D4EhwjboOQ" target="_yFTb0BtpEeeNbZVCoqtPGQ" routing="Rectilinear"> <children xmi:type="notation:DecorationNode" xmi:id="_WWidshXiEee_D4EhwjboOQ" type="Generalization_StereotypeLabel"> @@ -582,113 +699,6 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W1S2QhXiEee_D4EhwjboOQ" id="(0.6811145510835913,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W1TdUBXiEee_D4EhwjboOQ" id="(0.6811145510835913,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_bI71sBXiEee_D4EhwjboOQ" type="InterfaceRealization_Edge" source="_SokXIBXiEee_D4EhwjboOQ" target="_SpF7kBXiEee_D4EhwjboOQ" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_bI71sxXiEee_D4EhwjboOQ" type="InterfaceRealization_StereotypeLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_dZEsUBXiEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_bI71tBXiEee_D4EhwjboOQ" x="1" y="38"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_bI71tRXiEee_D4EhwjboOQ" type="InterfaceRealization_NameLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_dZSHsBXiEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_bI71thXiEee_D4EhwjboOQ" x="1" y="58"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_bI71sRXiEee_D4EhwjboOQ"/> - <element xmi:type="uml:InterfaceRealization" href="expressions.uml#_54HMIBVbEee_D4EhwjboOQ"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bI71shXiEee_D4EhwjboOQ" points="[280, 480, -643984, -643984]$[280, 440, -643984, -643984]$[640, 440, -643984, -643984]$[640, 320, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dZm30hXiEee_D4EhwjboOQ" id="(0.4953560371517028,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dZm30xXiEee_D4EhwjboOQ" id="(0.30959752321981426,1.0)"/> - </edges> - <edges xmi:type="notation:Connector" xmi:id="_45WKcBXiEee_D4EhwjboOQ" type="Association_Edge" source="_3NfFkBXiEee_D4EhwjboOQ" target="_SpF7kBXiEee_D4EhwjboOQ" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_45WKcxXiEee_D4EhwjboOQ" type="Association_StereotypeLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="__kIncBXiEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_45WKdBXiEee_D4EhwjboOQ" x="-1" y="-18"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_45WKdRXiEee_D4EhwjboOQ" type="Association_NameLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="__ktPMBXiEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_45WKdhXiEee_D4EhwjboOQ" y="19"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_45WKdxXiEee_D4EhwjboOQ" type="Association_TargetRoleLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="__k-U8BXiEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_45WKeBXiEee_D4EhwjboOQ" x="47" y="-18"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_45WKeRXiEee_D4EhwjboOQ" type="Association_SourceRoleLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="__lPasBXiEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_45WKehXiEee_D4EhwjboOQ" x="-47" y="19"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_45WKexXiEee_D4EhwjboOQ" type="Association_SourceMultiplicityLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="__lggcBXiEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_45WKfBXiEee_D4EhwjboOQ" x="47" y="19"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_45WKfRXiEee_D4EhwjboOQ" type="Association_TargetMultiplicityLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="__lw_IBXiEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_45WKfhXiEee_D4EhwjboOQ" x="-47" y="-18"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_45WKcRXiEee_D4EhwjboOQ"/> - <element xmi:type="uml:Association" href="expressions.uml#_44cLgBXiEee_D4EhwjboOQ"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_45WKchXiEee_D4EhwjboOQ" points="[680, 480, -643984, -643984]$[680, 400, -643984, -643984]$[680, 320, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_45_DoBXiEee_D4EhwjboOQ" id="(0.43343653250773995,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_45_DoRXiEee_D4EhwjboOQ" id="(0.43343653250773995,1.0)"/> - </edges> - <edges xmi:type="notation:Connector" xmi:id="_BxeowBXjEee_D4EhwjboOQ" type="Association_Edge" source="_2Gg2cBXiEee_D4EhwjboOQ" target="_SpF7kBXiEee_D4EhwjboOQ" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_BxeowxXjEee_D4EhwjboOQ" type="Association_StereotypeLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="__rKAABXjEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_BxeoxBXjEee_D4EhwjboOQ" y="-20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_BxeoxRXjEee_D4EhwjboOQ" type="Association_NameLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="__rn6EBXjEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_BxeoxhXjEee_D4EhwjboOQ" y="20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_BxeoxxXjEee_D4EhwjboOQ" type="Association_TargetRoleLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="__sHCQBXjEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_BxeoyBXjEee_D4EhwjboOQ" x="69" y="-20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_BxeoyRXjEee_D4EhwjboOQ" type="Association_SourceRoleLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="__shR8BXjEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_BxeoyhXjEee_D4EhwjboOQ" x="-69" y="20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_BxeoyxXjEee_D4EhwjboOQ" type="Association_SourceMultiplicityLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="__s3QMBXjEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_BxeozBXjEee_D4EhwjboOQ" x="69" y="20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_BxeozRXjEee_D4EhwjboOQ" type="Association_TargetMultiplicityLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="__tNOcBXjEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_BxeozhXjEee_D4EhwjboOQ" x="-27" y="-40"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_BxeowRXjEee_D4EhwjboOQ"/> - <element xmi:type="uml:Association" href="expressions.uml#_BwWAUBXjEee_D4EhwjboOQ"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BxeowhXjEee_D4EhwjboOQ" points="[-240, 480, -643984, -643984]$[-240, 260, -643984, -643984]$[540, 260, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ByLzYBXjEee_D4EhwjboOQ" id="(0.1238390092879257,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ByLzYRXjEee_D4EhwjboOQ" id="(0.0,0.4)"/> - </edges> - <edges xmi:type="notation:Connector" xmi:id="_Jt8JABXjEee_D4EhwjboOQ" type="InterfaceRealization_Edge" source="_3NfFkBXiEee_D4EhwjboOQ" target="_SpF7kBXiEee_D4EhwjboOQ" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_Jt8JAxXjEee_D4EhwjboOQ" type="InterfaceRealization_StereotypeLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-4soUBXjEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_Jt8JBBXjEee_D4EhwjboOQ" y="40"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_Jt8JBRXjEee_D4EhwjboOQ" type="InterfaceRealization_NameLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-5rfwBXjEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_Jt8JBhXjEee_D4EhwjboOQ" y="60"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_Jt8JARXjEee_D4EhwjboOQ"/> - <element xmi:type="uml:InterfaceRealization" href="expressions.uml#_JtfdEBXjEee_D4EhwjboOQ"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Jt8JAhXjEee_D4EhwjboOQ" points="[780, 480, -643984, -643984]$[780, 400, -643984, -643984]$[780, 320, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Juj0EBXjEee_D4EhwjboOQ" id="(0.7430340557275542,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Juj0ERXjEee_D4EhwjboOQ" id="(0.7430340557275542,1.0)"/> - </edges> - <edges xmi:type="notation:Connector" xmi:id="_p90J0BXjEee_D4EhwjboOQ" type="InterfaceRealization_Edge" source="_2Gg2cBXiEee_D4EhwjboOQ" target="_SpF7kBXiEee_D4EhwjboOQ" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_p90J0xXjEee_D4EhwjboOQ" type="InterfaceRealization_StereotypeLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="__tiloBXjEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_p90J1BXjEee_D4EhwjboOQ" y="40"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_p90J1RXjEee_D4EhwjboOQ" type="InterfaceRealization_NameLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="__t3VwBXjEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_p90J1hXjEee_D4EhwjboOQ" y="60"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_p90J0RXjEee_D4EhwjboOQ"/> - <element xmi:type="uml:InterfaceRealization" href="expressions.uml#_p9NF0BXjEee_D4EhwjboOQ"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_p90J0hXjEee_D4EhwjboOQ" points="[0, 480, -643984, -643984]$[0, 440, -643984, -643984]$[560, 440, -643984, -643984]$[560, 320, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_p-dqEBXjEee_D4EhwjboOQ" id="(0.8668730650154799,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_p-dqERXjEee_D4EhwjboOQ" id="(0.06191950464396285,1.0)"/> - </edges> <edges xmi:type="notation:Connector" xmi:id="_w60_QBXjEee_D4EhwjboOQ" type="InterfaceRealization_Edge" source="_scnHgBXjEee_D4EhwjboOQ" target="_SpF7kBXiEee_D4EhwjboOQ" routing="Rectilinear"> <children xmi:type="notation:DecorationNode" xmi:id="_w60_QxXjEee_D4EhwjboOQ" type="InterfaceRealization_StereotypeLabel"> <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1XCr4BXjEee_D4EhwjboOQ" name="IS_UPDATED_POSITION" booleanValue="true"/> @@ -700,191 +710,58 @@ </children> <styles xmi:type="notation:FontStyle" xmi:id="_w60_QRXjEee_D4EhwjboOQ"/> <element xmi:type="uml:InterfaceRealization" href="expressions.uml#_w6Uo8BXjEee_D4EhwjboOQ"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w60_QhXjEee_D4EhwjboOQ" points="[1480, 480, -643984, -643984]$[1480, 380, -643984, -643984]$[820, 380, -643984, -643984]$[820, 320, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7g7wBXjEee_D4EhwjboOQ" id="(0.4953560371517028,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7g7wRXjEee_D4EhwjboOQ" id="(0.8668730650154799,1.0)"/> - </edges> - <edges xmi:type="notation:Connector" xmi:id="_luaLMBn2EeeYEuQJkmbFAA" type="Association_Edge" source="_2Gg2cBXiEee_D4EhwjboOQ" target="_SpF7kBXiEee_D4EhwjboOQ" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_luaLMxn2EeeYEuQJkmbFAA" type="Association_StereotypeLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ASJvoBn3EeeYEuQJkmbFAA" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_luaLNBn2EeeYEuQJkmbFAA" y="-20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_luaLNRn2EeeYEuQJkmbFAA" type="Association_NameLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ASu-cBn3EeeYEuQJkmbFAA" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_luaLNhn2EeeYEuQJkmbFAA" y="20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_luaLNxn2EeeYEuQJkmbFAA" type="Association_TargetRoleLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ATGx4Bn3EeeYEuQJkmbFAA" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_luaLOBn2EeeYEuQJkmbFAA" x="126" y="-20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_luaLORn2EeeYEuQJkmbFAA" type="Association_SourceRoleLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ATgagBn3EeeYEuQJkmbFAA" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_luaLOhn2EeeYEuQJkmbFAA" x="-126" y="20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_luaLOxn2EeeYEuQJkmbFAA" type="Association_SourceMultiplicityLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_AT3m4Bn3EeeYEuQJkmbFAA" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_luaLPBn2EeeYEuQJkmbFAA" x="126" y="20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_luaLPRn2EeeYEuQJkmbFAA" type="Association_TargetMultiplicityLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_AUPaUBn3EeeYEuQJkmbFAA" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_luaLPhn2EeeYEuQJkmbFAA" x="-126" y="-20"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_luaLMRn2EeeYEuQJkmbFAA"/> - <element xmi:type="uml:Association" href="expressions.uml#_ltsZgBn2EeeYEuQJkmbFAA"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_luaLMhn2EeeYEuQJkmbFAA" points="[-100, 480, -643984, -643984]$[-100, 300, -643984, -643984]$[540, 300, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lvKZIBn2EeeYEuQJkmbFAA" id="(0.5572755417956656,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lvKZIRn2EeeYEuQJkmbFAA" id="(0.0,0.8)"/> - </edges> - <edges xmi:type="notation:Connector" xmi:id="_mb2gABn2EeeYEuQJkmbFAA" type="Association_Edge" source="_SokXIBXiEee_D4EhwjboOQ" target="_SpF7kBXiEee_D4EhwjboOQ" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_mb3HEBn2EeeYEuQJkmbFAA" type="Association_StereotypeLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BdBnUBn3EeeYEuQJkmbFAA" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_mb3HERn2EeeYEuQJkmbFAA" y="-20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_mb3HEhn2EeeYEuQJkmbFAA" type="Association_NameLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BdVwYBn3EeeYEuQJkmbFAA" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_mb3HExn2EeeYEuQJkmbFAA" y="20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_mb3HFBn2EeeYEuQJkmbFAA" type="Association_TargetRoleLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BdruoBn3EeeYEuQJkmbFAA" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_mb3HFRn2EeeYEuQJkmbFAA" x="60" y="-20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_mb3HFhn2EeeYEuQJkmbFAA" type="Association_SourceRoleLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BeCT8Bn3EeeYEuQJkmbFAA" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_mb3HFxn2EeeYEuQJkmbFAA" x="-60" y="20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_mb3HGBn2EeeYEuQJkmbFAA" type="Association_SourceMultiplicityLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BeXEEBn3EeeYEuQJkmbFAA" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_mb3HGRn2EeeYEuQJkmbFAA" x="60" y="20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_mb3HGhn2EeeYEuQJkmbFAA" type="Association_TargetMultiplicityLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BesbQBn3EeeYEuQJkmbFAA" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_mb3HGxn2EeeYEuQJkmbFAA" x="-60" y="-20"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_mb2gARn2EeeYEuQJkmbFAA"/> - <element xmi:type="uml:Association" href="expressions.uml#_mbLxoBn2EeeYEuQJkmbFAA"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mb2gAhn2EeeYEuQJkmbFAA" points="[320, 480, -643984, -643984]$[320, 300, -643984, -643984]$[540, 300, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mcupwBn2EeeYEuQJkmbFAA" id="(0.6191950464396285,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mcupwRn2EeeYEuQJkmbFAA" id="(0.0,0.8)"/> - </edges> - <edges xmi:type="notation:Connector" xmi:id="_nhpDYBn2EeeYEuQJkmbFAA" type="Association_Edge" source="_3NfFkBXiEee_D4EhwjboOQ" target="_SpF7kBXiEee_D4EhwjboOQ"> - <children xmi:type="notation:DecorationNode" xmi:id="_nhpqcBn2EeeYEuQJkmbFAA" type="Association_StereotypeLabel"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_nhpqcRn2EeeYEuQJkmbFAA" y="-20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_nhpqchn2EeeYEuQJkmbFAA" type="Association_NameLabel"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_nhpqcxn2EeeYEuQJkmbFAA" y="20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_nhpqdBn2EeeYEuQJkmbFAA" type="Association_TargetRoleLabel"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_nhpqdRn2EeeYEuQJkmbFAA" y="-20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_nhpqdhn2EeeYEuQJkmbFAA" type="Association_SourceRoleLabel"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_nhpqdxn2EeeYEuQJkmbFAA" y="20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_nhpqeBn2EeeYEuQJkmbFAA" type="Association_SourceMultiplicityLabel"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_nhpqeRn2EeeYEuQJkmbFAA" y="20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_nhpqehn2EeeYEuQJkmbFAA" type="Association_TargetMultiplicityLabel"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_nhpqexn2EeeYEuQJkmbFAA" y="-20"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_nhpDYRn2EeeYEuQJkmbFAA"/> - <element xmi:type="uml:Association" href="expressions.uml#_nhEboBn2EeeYEuQJkmbFAA"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nhpDYhn2EeeYEuQJkmbFAA" points="[720, 480, -643984, -643984]$[720, 320, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nidiwBn2EeeYEuQJkmbFAA" id="(0.5572755417956656,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nieJ0Bn2EeeYEuQJkmbFAA" id="(0.5572755417956656,1.0)"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w60_QhXjEee_D4EhwjboOQ" points="[2380, 920, -643984, -643984]$[2380, 260, -643984, -643984]$[863, 260, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7g7wBXjEee_D4EhwjboOQ" id="(0.5037783375314862,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w7g7wRXjEee_D4EhwjboOQ" id="(1.0,0.4)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_cHxesBrTEeeJdcoPLKQK3g" type="Comment_AnnotatedElementEdge" source="_EmKOgBrTEeeJdcoPLKQK3g" target="_scnHgBXjEee_D4EhwjboOQ"> <styles xmi:type="notation:FontStyle" xmi:id="_cHxesRrTEeeJdcoPLKQK3g"/> <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cHxeshrTEeeJdcoPLKQK3g" points="[1500, 680, -643984, -643984]$[1500, 580, -643984, -643984]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cHxeshrTEeeJdcoPLKQK3g" points="[2340, 1200, -643984, -643984]$[2340, 1100, -643984, -643984]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cKie0BrTEeeJdcoPLKQK3g" id="(0.4953560371517028,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cKie0RrTEeeJdcoPLKQK3g" id="(0.4953560371517028,1.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cKie0RrTEeeJdcoPLKQK3g" id="(0.5037783375314862,1.0)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_d4cLEBrTEeeJdcoPLKQK3g" type="Comment_AnnotatedElementEdge" source="_BxAmUBrTEeeJdcoPLKQK3g" target="_SqiGABXiEee_D4EhwjboOQ"> <styles xmi:type="notation:FontStyle" xmi:id="_d4cLERrTEeeJdcoPLKQK3g"/> <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d4cLEhrTEeeJdcoPLKQK3g" points="[1120, 680, -643984, -643984]$[1120, 580, -643984, -643984]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d4cLEhrTEeeJdcoPLKQK3g" points="[1960, 1200, -643984, -643984]$[1960, 1100, -643984, -643984]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d8QUEBrTEeeJdcoPLKQK3g" id="(0.5572755417956656,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d8QUERrTEeeJdcoPLKQK3g" id="(0.5572755417956656,1.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d8QUERrTEeeJdcoPLKQK3g" id="(0.5541561712846348,1.0)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_eZ4rQBrTEeeJdcoPLKQK3g" type="Comment_AnnotatedElementEdge" source="_oD69ERrSEeeJdcoPLKQK3g" target="_3NfFkBXiEee_D4EhwjboOQ"> <styles xmi:type="notation:FontStyle" xmi:id="_eZ4rQRrTEeeJdcoPLKQK3g"/> <element xsi:nil="true"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eZ4rQhrTEeeJdcoPLKQK3g" points="[680, 682, -643984, -643984]$[680, 580, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ecesQBrTEeeJdcoPLKQK3g" id="(0.43343653250773995,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ecesQRrTEeeJdcoPLKQK3g" id="(0.43343653250773995,1.0)"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ecesQBrTEeeJdcoPLKQK3g" id="(0.4953560371517028,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ecesQRrTEeeJdcoPLKQK3g" id="(0.5037783375314862,1.0)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_fX_SQBrTEeeJdcoPLKQK3g" type="Comment_AnnotatedElementEdge" source="_mKKmIBrSEeeJdcoPLKQK3g" target="_SokXIBXiEee_D4EhwjboOQ"> <styles xmi:type="notation:FontStyle" xmi:id="_fX_SQRrTEeeJdcoPLKQK3g"/> <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fX_SQhrTEeeJdcoPLKQK3g" points="[320, 680, -643984, -643984]$[320, 580, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_faqLwBrTEeeJdcoPLKQK3g" id="(0.6191950464396285,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_faqLwRrTEeeJdcoPLKQK3g" id="(0.6191950464396285,1.0)"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fX_SQhrTEeeJdcoPLKQK3g" points="[420, 1340, -643984, -643984]$[420, 1240, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_faqLwBrTEeeJdcoPLKQK3g" id="(0.4953560371517028,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_faqLwRrTEeeJdcoPLKQK3g" id="(0.5037783375314862,1.0)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_f17LcBrTEeeJdcoPLKQK3g" type="Comment_AnnotatedElementEdge" source="_GlZPUBn3EeeYEuQJkmbFAA" target="_2Gg2cBXiEee_D4EhwjboOQ"> <styles xmi:type="notation:FontStyle" xmi:id="_f17LcRrTEeeJdcoPLKQK3g"/> <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f17LchrTEeeJdcoPLKQK3g" points="[-140, 680, -643984, -643984]$[-140, 580, -643984, -643984]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f17LchrTEeeJdcoPLKQK3g" points="[-140, 1340, -643984, -643984]$[-140, 1240, -643984, -643984]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f4eJIBrTEeeJdcoPLKQK3g" id="(0.4953560371517028,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f4eJIRrTEeeJdcoPLKQK3g" id="(0.43343653250773995,1.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f4eJIRrTEeeJdcoPLKQK3g" id="(0.5037783375314862,1.0)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_l1gvUBrTEeeJdcoPLKQK3g" type="Comment_AnnotatedElementEdge" source="_hcjLABrTEeeJdcoPLKQK3g" target="_SpF7kBXiEee_D4EhwjboOQ"> <styles xmi:type="notation:FontStyle" xmi:id="_l1gvURrTEeeJdcoPLKQK3g"/> <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l1gvUhrTEeeJdcoPLKQK3g" points="[1040, 300, -643984, -643984]$[863, 280, -643984, -643984]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l1gvUhrTEeeJdcoPLKQK3g" points="[1020, 160, -643984, -643984]$[863, 280, -643984, -643984]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l4bgcBrTEeeJdcoPLKQK3g" id="(0.0,0.6666666666666666)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l4bgcRrTEeeJdcoPLKQK3g" id="(1.0,0.6)"/> - </edges> - <edges xmi:type="notation:Connector" xmi:id="_rpCNIBrTEeeJdcoPLKQK3g" type="Association_Edge" source="_oVDT4BrTEeeJdcoPLKQK3g" target="_SpF7kBXiEee_D4EhwjboOQ" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_rpC0MBrTEeeJdcoPLKQK3g" type="Association_StereotypeLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_t_rUYBrTEeeJdcoPLKQK3g" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_rpC0MRrTEeeJdcoPLKQK3g" x="-1" y="-18"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_rpC0MhrTEeeJdcoPLKQK3g" type="Association_NameLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uBHe0BrTEeeJdcoPLKQK3g" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_rpC0MxrTEeeJdcoPLKQK3g" x="1" y="19"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_rpC0NBrTEeeJdcoPLKQK3g" type="Association_TargetRoleLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uCjCMBrTEeeJdcoPLKQK3g" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_rpC0NRrTEeeJdcoPLKQK3g" x="43" y="-18"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_rpC0NhrTEeeJdcoPLKQK3g" type="Association_SourceRoleLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uEJksBrTEeeJdcoPLKQK3g" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_rpC0NxrTEeeJdcoPLKQK3g" x="-43" y="19"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_rpC0OBrTEeeJdcoPLKQK3g" type="Association_SourceMultiplicityLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uFqAkBrTEeeJdcoPLKQK3g" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_rpC0ORrTEeeJdcoPLKQK3g" x="45" y="19"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_rpC0OhrTEeeJdcoPLKQK3g" type="Association_TargetMultiplicityLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uH_i4BrTEeeJdcoPLKQK3g" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_rpC0OxrTEeeJdcoPLKQK3g" x="-46" y="-18"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_rpCNIRrTEeeJdcoPLKQK3g"/> - <element xmi:type="uml:Association" href="expressions.uml#_rnWLEBrTEeeJdcoPLKQK3g"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rpCNIhrTEeeJdcoPLKQK3g" points="[-100, 220, -643984, -643984]$[-100, 240, -643984, -643984]$[540, 240, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rsOrEBrTEeeJdcoPLKQK3g" id="(0.4953560371517028,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rsOrERrTEeeJdcoPLKQK3g" id="(1.0,0.2)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l4bgcRrTEeeJdcoPLKQK3g" id="(1.0,0.2)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_X21_kBrUEeeJdcoPLKQK3g" type="Comment_AnnotatedElementEdge" source="_PMdCUBrUEeeJdcoPLKQK3g" target="_oVDT4BrTEeeJdcoPLKQK3g" routing="Rectilinear"> <styles xmi:type="notation:FontStyle" xmi:id="_X21_kRrUEeeJdcoPLKQK3g"/> <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_X21_khrUEeeJdcoPLKQK3g" points="[1900, 680, -643984, -643984]$[1900, 640, -643984, -643984]$[1900, 580, -643984, -643984]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_X21_khrUEeeJdcoPLKQK3g" points="[1460, 1360, -643984, -643984]$[1460, 640, -643984, -643984]$[1460, 1140, -643984, -643984]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_X6yrcBrUEeeJdcoPLKQK3g" id="(0.4953560371517028,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_X6yrcRrUEeeJdcoPLKQK3g" id="(0.4953560371517028,1.0)"/> - </edges> - <edges xmi:type="notation:Connector" xmi:id="_99qloBrUEeeJdcoPLKQK3g" type="InterfaceRealization_Edge" source="_oVDT4BrTEeeJdcoPLKQK3g" target="_SpF7kBXiEee_D4EhwjboOQ" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_99qloxrUEeeJdcoPLKQK3g" type="InterfaceRealization_StereotypeLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_eGndUCaBEeexSJ7rHbRCGQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_99qlpBrUEeeJdcoPLKQK3g" y="39"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_99qlpRrUEeeJdcoPLKQK3g" type="InterfaceRealization_NameLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_eHXEMCaBEeexSJ7rHbRCGQ" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_99qlphrUEeeJdcoPLKQK3g" x="1" y="59"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_99qloRrUEeeJdcoPLKQK3g"/> - <element xmi:type="uml:InterfaceRealization" href="expressions.uml#_98AYwBrUEeeJdcoPLKQK3g"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_99qlohrUEeeJdcoPLKQK3g" points="[1800, 480, -643984, -643984]$[1800, 380, -643984, -643984]$[820, 380, -643984, -643984]$[820, 320, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-A6G4BrUEeeJdcoPLKQK3g" id="(0.18575851393188855,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-A6G4RrUEeeJdcoPLKQK3g" id="(0.8668730650154799,1.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_X6yrcRrUEeeJdcoPLKQK3g" id="(0.5037783375314862,0.0)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_1oRMQBtpEeeNbZVCoqtPGQ" type="TemplateBinding_Edge" source="_yFTb0BtpEeeNbZVCoqtPGQ" target="_WV7ZsBXiEee_D4EhwjboOQ" routing="Rectilinear"> <children xmi:type="notation:DecorationNode" xmi:id="_1oRzUBtpEeeNbZVCoqtPGQ" type="TemplateBinding_SubstitutionLabel"> @@ -912,6 +789,265 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hHfdkBtuEeeI-LWWg9sIYg" id="(0.30959752321981426,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hHfdkRtuEeeI-LWWg9sIYg" id="(0.30959752321981426,1.0)"/> </edges> + <edges xmi:type="notation:Connector" xmi:id="_uMBXgJHXEemkbNOY_7-CZA" type="InterfaceRealization_Edge" source="_RqnB8JHWEemkbNOY_7-CZA" target="_SpF7kBXiEee_D4EhwjboOQ"> + <children xmi:type="notation:DecorationNode" xmi:id="_uMB-kJHXEemkbNOY_7-CZA" type="InterfaceRealization_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1phq4JHXEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_uMB-kZHXEemkbNOY_7-CZA" y="40"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_uMB-kpHXEemkbNOY_7-CZA" type="InterfaceRealization_NameLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2O2lgJHXEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_uMB-k5HXEemkbNOY_7-CZA" y="60"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_uMBXgZHXEemkbNOY_7-CZA"/> + <element xmi:type="uml:InterfaceRealization" href="expressions.uml#_tpYkgJHXEemkbNOY_7-CZA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uMBXgpHXEemkbNOY_7-CZA" points="[20, 920, -643984, -643984]$[20, 300, -643984, -643984]$[540, 300, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vO0RQJHXEemkbNOY_7-CZA" id="(0.8513853904282116,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vO04UJHXEemkbNOY_7-CZA" id="(0.0,0.8)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_3xfc8JHXEemkbNOY_7-CZA" type="InterfaceRealization_Edge" source="_16FE0JHWEemkbNOY_7-CZA" target="_SpF7kBXiEee_D4EhwjboOQ"> + <children xmi:type="notation:DecorationNode" xmi:id="_3xfc85HXEemkbNOY_7-CZA" type="InterfaceRealization_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oNClsJHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_3xfc9JHXEemkbNOY_7-CZA" y="40"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_3xfc9ZHXEemkbNOY_7-CZA" type="InterfaceRealization_NameLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_o4ZP0JHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_3xfc9pHXEemkbNOY_7-CZA" y="60"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_3xfc8ZHXEemkbNOY_7-CZA"/> + <element xmi:type="uml:InterfaceRealization" href="expressions.uml#_3ODYsJHXEemkbNOY_7-CZA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3xfc8pHXEemkbNOY_7-CZA" points="[280, 920, -643984, -643984]$[280, 300, -643984, -643984]$[540, 300, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4vL0QJHXEemkbNOY_7-CZA" id="(0.14962593516209477,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4vMbUJHXEemkbNOY_7-CZA" id="(0.0,0.8)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_-6-oIJHXEemkbNOY_7-CZA" type="InterfaceRealization_Edge" source="_vbaYQJHWEemkbNOY_7-CZA" target="_SpF7kBXiEee_D4EhwjboOQ"> + <children xmi:type="notation:DecorationNode" xmi:id="_-6-oI5HXEemkbNOY_7-CZA" type="InterfaceRealization_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_X-rWIJHYEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_-6-oJJHXEemkbNOY_7-CZA" y="40"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_-6_PMJHXEemkbNOY_7-CZA" type="InterfaceRealization_NameLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_YispMJHYEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_-6_PMZHXEemkbNOY_7-CZA" y="60"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_-6-oIZHXEemkbNOY_7-CZA"/> + <element xmi:type="uml:InterfaceRealization" href="expressions.uml#_-YK2AJHXEemkbNOY_7-CZA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-6-oIpHXEemkbNOY_7-CZA" points="[840, 920, -643984, -643984]$[840, 320, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__5gs8JHXEemkbNOY_7-CZA" id="(0.29925187032418954,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__5hUAJHXEemkbNOY_7-CZA" id="(0.9287925696594427,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_DDkOIJHYEemkbNOY_7-CZA" type="Association_Edge" source="_RqnB8JHWEemkbNOY_7-CZA" target="_SpF7kBXiEee_D4EhwjboOQ"> + <children xmi:type="notation:DecorationNode" xmi:id="_DDk1MJHYEemkbNOY_7-CZA" type="Association_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_kGb8sJHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_DDk1MZHYEemkbNOY_7-CZA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_DDk1MpHYEemkbNOY_7-CZA" type="Association_NameLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_kqnAwJHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_DDk1M5HYEemkbNOY_7-CZA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_DDk1NJHYEemkbNOY_7-CZA" type="Association_TargetRoleLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lDCH0JHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_DDk1NZHYEemkbNOY_7-CZA" x="207" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_DDlcQJHYEemkbNOY_7-CZA" type="Association_SourceRoleLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_la84kJHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_DDlcQZHYEemkbNOY_7-CZA" x="-207" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_DDlcQpHYEemkbNOY_7-CZA" type="Association_SourceMultiplicityLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lw0a4JHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_DDlcQ5HYEemkbNOY_7-CZA" x="207" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_DDlcRJHYEemkbNOY_7-CZA" type="Association_TargetMultiplicityLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mI5jsJHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_DDlcRZHYEemkbNOY_7-CZA" x="-207" y="-20"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_DDkOIZHYEemkbNOY_7-CZA"/> + <element xmi:type="uml:Association" href="expressions.uml#_CfEZ8JHYEemkbNOY_7-CZA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DDkOIpHYEemkbNOY_7-CZA" points="[-180, 920, -643984, -643984]$[-180, 280, -643984, -643984]$[540, 280, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D_XIAJHYEemkbNOY_7-CZA" id="(0.34760705289672544,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D_XvEJHYEemkbNOY_7-CZA" id="(0.0,0.4)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_PTrU4JHYEemkbNOY_7-CZA" type="Association_Edge" source="_16FE0JHWEemkbNOY_7-CZA" target="_SpF7kBXiEee_D4EhwjboOQ"> + <children xmi:type="notation:DecorationNode" xmi:id="_PTr78JHYEemkbNOY_7-CZA" type="Association_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0GTSsJHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_PTr78ZHYEemkbNOY_7-CZA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_PTr78pHYEemkbNOY_7-CZA" type="Association_NameLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_0xFVEJHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_PTsjAJHYEemkbNOY_7-CZA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_PTsjAZHYEemkbNOY_7-CZA" type="Association_TargetRoleLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1LIMwJHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_PTsjApHYEemkbNOY_7-CZA" x="120" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_PTsjA5HYEemkbNOY_7-CZA" type="Association_SourceRoleLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1hWUYJHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_PTsjBJHYEemkbNOY_7-CZA" x="-20" y="120"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_PTsjBZHYEemkbNOY_7-CZA" type="Association_SourceMultiplicityLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1382gJHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_PTsjBpHYEemkbNOY_7-CZA" x="120" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_PTsjB5HYEemkbNOY_7-CZA" type="Association_TargetMultiplicityLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2PbiYJHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_PTsjCJHYEemkbNOY_7-CZA" x="-20" y="80"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_PTrU4ZHYEemkbNOY_7-CZA"/> + <element xmi:type="uml:Association" href="expressions.uml#_OwLmQJHYEemkbNOY_7-CZA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PTrU4pHYEemkbNOY_7-CZA" points="[600, 920, -643984, -643984]$[600, 320, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QR1mQJHYEemkbNOY_7-CZA" id="(0.9476309226932669,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QR2NUJHYEemkbNOY_7-CZA" id="(0.18575851393188855,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_bAStAJHYEemkbNOY_7-CZA" type="Association_Edge" source="_fijCIJHWEemkbNOY_7-CZA" target="_SpF7kBXiEee_D4EhwjboOQ"> + <children xmi:type="notation:DecorationNode" xmi:id="_bAT7IJHYEemkbNOY_7-CZA" type="Association_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_CXA80JJqEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_bAT7IZHYEemkbNOY_7-CZA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_bAT7IpHYEemkbNOY_7-CZA" type="Association_NameLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_C7bRcJJqEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_bAT7I5HYEemkbNOY_7-CZA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_bAT7JJHYEemkbNOY_7-CZA" type="Association_TargetRoleLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DWQzUJJqEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_bAT7JZHYEemkbNOY_7-CZA" x="222" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_bAT7JpHYEemkbNOY_7-CZA" type="Association_SourceRoleLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DwEacJJqEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_bAT7J5HYEemkbNOY_7-CZA" x="-222" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_bAT7KJHYEemkbNOY_7-CZA" type="Association_SourceMultiplicityLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_EG4X8JJqEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_bAT7KZHYEemkbNOY_7-CZA" x="222" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_bAT7KpHYEemkbNOY_7-CZA" type="Association_TargetMultiplicityLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Efu80JJqEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_bAT7K5HYEemkbNOY_7-CZA" x="-222" y="-20"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_bAStAZHYEemkbNOY_7-CZA"/> + <element xmi:type="uml:Association" href="expressions.uml#_addFsJHYEemkbNOY_7-CZA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bAStApHYEemkbNOY_7-CZA" points="[1460, 920, -643984, -643984]$[1460, 320, -643984, -643984]$[863, 320, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_b6edUJHYEemkbNOY_7-CZA" id="(0.49875311720698257,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_b6edUZHYEemkbNOY_7-CZA" id="(1.0,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_g51TQJHYEemkbNOY_7-CZA" type="Association_Edge" source="_vbaYQJHWEemkbNOY_7-CZA" target="_SpF7kBXiEee_D4EhwjboOQ"> + <children xmi:type="notation:DecorationNode" xmi:id="_g51TQ5HYEemkbNOY_7-CZA" type="Association_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4SIXgJJpEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_g51TRJHYEemkbNOY_7-CZA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_g51TRZHYEemkbNOY_7-CZA" type="Association_NameLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_47bMIJJpEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_g51TRpHYEemkbNOY_7-CZA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_g51TR5HYEemkbNOY_7-CZA" type="Association_TargetRoleLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_5VMXAJJpEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_g51TSJHYEemkbNOY_7-CZA" x="120" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_g516UJHYEemkbNOY_7-CZA" type="Association_SourceRoleLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_5sO-AJJpEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_g516UZHYEemkbNOY_7-CZA" x="-120" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_g516UpHYEemkbNOY_7-CZA" type="Association_SourceMultiplicityLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_6FwRQJJpEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_g516U5HYEemkbNOY_7-CZA" x="120" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_g516VJHYEemkbNOY_7-CZA" type="Association_TargetMultiplicityLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_6c8pQJJpEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_g516VZHYEemkbNOY_7-CZA" x="-120" y="-20"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_g51TQZHYEemkbNOY_7-CZA"/> + <element xmi:type="uml:Association" href="expressions.uml#_gX6R8JHYEemkbNOY_7-CZA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g51TQpHYEemkbNOY_7-CZA" points="[800, 920, -643984, -643984]$[800, 320, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h08QoJHYEemkbNOY_7-CZA" id="(0.19950124688279303,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h08QoZHYEemkbNOY_7-CZA" id="(0.804953560371517,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_n1ZXMJHYEemkbNOY_7-CZA" type="Generalization_Edge" source="_2Gg2cBXiEee_D4EhwjboOQ" target="_RqnB8JHWEemkbNOY_7-CZA" routing="Rectilinear"> + <children xmi:type="notation:DecorationNode" xmi:id="_n1ZXM5HYEemkbNOY_7-CZA" type="Generalization_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_D3tycJHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_n1ZXNJHYEemkbNOY_7-CZA" x="1" y="38"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_n1ZXMZHYEemkbNOY_7-CZA"/> + <element xmi:type="uml:Generalization" href="expressions.uml#_nTgLEJHYEemkbNOY_7-CZA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_n1ZXMpHYEemkbNOY_7-CZA" points="[-120, 1140, -643984, -643984]$[-120, 1020, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ouXmkJHYEemkbNOY_7-CZA" id="(0.5037783375314862,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ouXmkZHYEemkbNOY_7-CZA" id="(0.4987405541561713,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_qrW3sJHYEemkbNOY_7-CZA" type="Generalization_Edge" source="_SokXIBXiEee_D4EhwjboOQ" target="_16FE0JHWEemkbNOY_7-CZA"> + <children xmi:type="notation:DecorationNode" xmi:id="_qrXewJHYEemkbNOY_7-CZA" type="Generalization_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WmV0wJHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_qrXewZHYEemkbNOY_7-CZA" x="-1" y="38"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_qrW3sZHYEemkbNOY_7-CZA"/> + <element xmi:type="uml:Generalization" href="expressions.uml#_qM9EcJHYEemkbNOY_7-CZA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qrW3spHYEemkbNOY_7-CZA" points="[280, 592, -643984, -643984]$[400, 920, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rmEMcJHYEemkbNOY_7-CZA" id="(0.5037783375314862,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rmEMcZHYEemkbNOY_7-CZA" id="(0.49875311720698257,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_tgTrkJHYEemkbNOY_7-CZA" type="Generalization_Edge" source="_2Gg2cBXiEee_D4EhwjboOQ" target="_16FE0JHWEemkbNOY_7-CZA" routing="Rectilinear"> + <children xmi:type="notation:DecorationNode" xmi:id="_tgTrk5HYEemkbNOY_7-CZA" type="Generalization_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_EW-hUJHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_tgTrlJHYEemkbNOY_7-CZA" x="-1" y="38"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_tgTrkZHYEemkbNOY_7-CZA"/> + <element xmi:type="uml:Generalization" href="expressions.uml#_s-gmEJHYEemkbNOY_7-CZA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tgTrkpHYEemkbNOY_7-CZA" points="[-120, 1140, -643984, -643984]$[-120, 1080, -643984, -643984]$[420, 1080, -643984, -643984]$[420, 1020, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uY5gcJHYEemkbNOY_7-CZA" id="(0.5037783375314862,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uY5gcZHYEemkbNOY_7-CZA" id="(0.49875311720698257,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_wLjw4JHYEemkbNOY_7-CZA" type="Generalization_Edge" source="_SokXIBXiEee_D4EhwjboOQ" target="_RqnB8JHWEemkbNOY_7-CZA" routing="Rectilinear"> + <children xmi:type="notation:DecorationNode" xmi:id="_wLjw45HYEemkbNOY_7-CZA" type="Generalization_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XIT5YJHZEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_wLjw5JHYEemkbNOY_7-CZA" x="2" y="37"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_wLjw4ZHYEemkbNOY_7-CZA"/> + <element xmi:type="uml:Generalization" href="expressions.uml#_vtTHkJHYEemkbNOY_7-CZA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wLjw4pHYEemkbNOY_7-CZA" points="[420, 1140, -643984, -643984]$[420, 1080, -643984, -643984]$[-120, 1080, -643984, -643984]$[-120, 1020, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xGLmEJHYEemkbNOY_7-CZA" id="(0.5037783375314862,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xGLmEZHYEemkbNOY_7-CZA" id="(0.4987405541561713,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_ywJNgJHYEemkbNOY_7-CZA" type="Generalization_Edge" source="_3NfFkBXiEee_D4EhwjboOQ" target="_vbaYQJHWEemkbNOY_7-CZA"> + <children xmi:type="notation:DecorationNode" xmi:id="_ywKboJHYEemkbNOY_7-CZA" type="Generalization_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_svfawJJpEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_ywKboZHYEemkbNOY_7-CZA" x="-1" y="38"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_ywJNgZHYEemkbNOY_7-CZA"/> + <element xmi:type="uml:Generalization" href="expressions.uml#_yNmhIJHYEemkbNOY_7-CZA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ywJNgpHYEemkbNOY_7-CZA" points="[700, 592, -643984, -643984]$[860, 920, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zpa-4JHYEemkbNOY_7-CZA" id="(0.5037783375314862,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zpa-4ZHYEemkbNOY_7-CZA" id="(0.49875311720698257,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_1xKHcJHYEemkbNOY_7-CZA" type="Generalization_Edge" source="_3NfFkBXiEee_D4EhwjboOQ" target="_fijCIJHWEemkbNOY_7-CZA" routing="Rectilinear"> + <children xmi:type="notation:DecorationNode" xmi:id="_1xKHc5HYEemkbNOY_7-CZA" type="Generalization_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_tGSKIJJpEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_1xKHdJHYEemkbNOY_7-CZA" x="1" y="38"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_1xKHcZHYEemkbNOY_7-CZA"/> + <element xmi:type="uml:Generalization" href="expressions.uml#_1TDPIJHYEemkbNOY_7-CZA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1xKHcpHYEemkbNOY_7-CZA" points="[920, 1140, -643984, -643984]$[920, 1080, -643984, -643984]$[1400, 1080, -643984, -643984]$[1400, 1020, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2qQ5sJHYEemkbNOY_7-CZA" id="(0.5037783375314862,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2qQ5sZHYEemkbNOY_7-CZA" id="(0.3491271820448878,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_4szZMJHYEemkbNOY_7-CZA" type="Generalization_Edge" source="_oVDT4BrTEeeJdcoPLKQK3g" target="_fijCIJHWEemkbNOY_7-CZA" routing="Rectilinear"> + <children xmi:type="notation:DecorationNode" xmi:id="_4szZM5HYEemkbNOY_7-CZA" type="Generalization_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_E8cG8JJqEemkbNOY_7-CZA" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_4szZNJHYEemkbNOY_7-CZA" x="1" y="37"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_4szZMZHYEemkbNOY_7-CZA"/> + <element xmi:type="uml:Generalization" href="expressions.uml#_4K3w0JHYEemkbNOY_7-CZA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4szZMpHYEemkbNOY_7-CZA" points="[1520, 1140, -643984, -643984]$[1520, 1020, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5lhw8JHYEemkbNOY_7-CZA" id="(0.654911838790932,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5lhw8ZHYEemkbNOY_7-CZA" id="(0.6483790523690773,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_uMw3wJJuEemkbNOY_7-CZA" type="InterfaceRealization_Edge" source="_fijCIJHWEemkbNOY_7-CZA" target="_SpF7kBXiEee_D4EhwjboOQ"> + <children xmi:type="notation:DecorationNode" xmi:id="_uMxe0JJuEemkbNOY_7-CZA" type="InterfaceRealization_StereotypeLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_uMxe0ZJuEemkbNOY_7-CZA" y="40"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_uMxe0pJuEemkbNOY_7-CZA" type="InterfaceRealization_NameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_uMxe05JuEemkbNOY_7-CZA" y="60"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_uMw3wZJuEemkbNOY_7-CZA"/> + <element xmi:type="uml:InterfaceRealization" href="expressions.uml#_tpADYJJuEemkbNOY_7-CZA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uMw3wpJuEemkbNOY_7-CZA" points="[1560, 920, -643984, -643984]$[863, 260, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vPPocJJuEemkbNOY_7-CZA" id="(0.7481296758104738,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vPPocZJuEemkbNOY_7-CZA" id="(1.0,0.4)"/> + </edges> </notation:Diagram> <notation:Diagram xmi:id="_ksJ-MI3OEemaCNM_5JlkJw" type="PapyrusUMLClassDiagram" name="EMFExpression" measurementUnit="Pixel"> <children xmi:type="notation:Shape" xmi:id="_nDRmkI3OEemaCNM_5JlkJw" type="Interface_Shape"> @@ -972,7 +1108,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sI8f6Y3OEemaCNM_5JlkJw"/> </children> <element xmi:type="uml:Class" href="expressions.uml#_sIyu4I3OEemaCNM_5JlkJw"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sI740Y3OEemaCNM_5JlkJw" x="700" y="360" width="261"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sI740Y3OEemaCNM_5JlkJw" x="700" y="360" width="281"/> </children> <styles xmi:type="notation:StringValueStyle" xmi:id="_ksJ-MY3OEemaCNM_5JlkJw" name="diagram_compatibility_version" stringValue="1.4.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_ksJ-Mo3OEemaCNM_5JlkJw"/> @@ -992,8 +1128,8 @@ <styles xmi:type="notation:FontStyle" xmi:id="_NB2PkY3PEemaCNM_5JlkJw"/> <element xmi:type="uml:InterfaceRealization" href="expressions.uml#_NBlw4I3PEemaCNM_5JlkJw"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NB2Pko3PEemaCNM_5JlkJw" points="[320, 520, -643984, -643984]$[780, 224, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NCRGUI3PEemaCNM_5JlkJw" id="(0.3831417624521073,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NCRGUY3PEemaCNM_5JlkJw" id="(0.35587188612099646,1.0)"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NCRGUI3PEemaCNM_5JlkJw" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NCRGUY3PEemaCNM_5JlkJw" id="(0.498220640569395,1.0)"/> </edges> </notation:Diagram> <notation:Diagram xmi:id="_wR8uoJDZEemH9rXHQn6H-Q" type="emftree" name="Emf Tree"/> diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.uml b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.uml index 7a4754335a4..9781d7dc4bf 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.uml +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/model/expressions.uml @@ -92,104 +92,28 @@ If there is no expression referenced we return TRUE.</body> <generalization xmi:type="uml:Generalization" xmi:id="_KMXTMBVbEee_D4EhwjboOQ" general="_yFQYgBtpEeeNbZVCoqtPGQ"/> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_WpVKMBVbEee_D4EhwjboOQ" name="AndExpression"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_cc7ggRVbEee_D4EhwjboOQ" name="ownedExpressions" type="_P-MkYBVaEee_D4EhwjboOQ" aggregation="composite" association="_cc5rUBVbEee_D4EhwjboOQ"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eUuvoBVbEee_D4EhwjboOQ"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eU5uwBVbEee_D4EhwjboOQ" value="*"/> - </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_mbMYshn2EeeYEuQJkmbFAA" name="referencedExpressions" type="_P-MkYBVaEee_D4EhwjboOQ" association="_mbLxoBn2EeeYEuQJkmbFAA"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dJVfYI6yEemjwpaBkaWY0Q" source="http://www.eclipse.org/emf/2002/GenModel"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dJVfYY6yEemjwpaBkaWY0Q" key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/expressions/multiBooleanExpressionsReference"/> - </eAnnotations> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yV2M0Bn2EeeYEuQJkmbFAA"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yWOnUBn2EeeYEuQJkmbFAA" value="*"/> - </ownedAttribute> - <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_54HMIBVbEee_D4EhwjboOQ" client="_WpVKMBVbEee_D4EhwjboOQ" supplier="_P-MkYBVaEee_D4EhwjboOQ" contract="_P-MkYBVaEee_D4EhwjboOQ"/> - </packagedElement> - <packagedElement xmi:type="uml:Association" xmi:id="_cc5rUBVbEee_D4EhwjboOQ" memberEnd="_cc7ggRVbEee_D4EhwjboOQ _cc8HkBVbEee_D4EhwjboOQ"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cc65cBVbEee_D4EhwjboOQ" source="org.eclipse.papyrus"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cc7ggBVbEee_D4EhwjboOQ" key="nature" value="UML_Nature"/> - </eAnnotations> - <ownedEnd xmi:type="uml:Property" xmi:id="_cc8HkBVbEee_D4EhwjboOQ" name="andexpression" type="_WpVKMBVbEee_D4EhwjboOQ" association="_cc5rUBVbEee_D4EhwjboOQ"/> + <generalization xmi:type="uml:Generalization" xmi:id="_qM9EcJHYEemkbNOY_7-CZA" general="_16D2sJHWEemkbNOY_7-CZA"/> + <generalization xmi:type="uml:Generalization" xmi:id="_vtTHkJHYEemkbNOY_7-CZA" general="_RqUHAJHWEemkbNOY_7-CZA"/> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_wcKe0BVKEee_D4EhwjboOQ" name="LiteralTrueExpression"> <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_5eytMBVbEee_D4EhwjboOQ" client="_wcKe0BVKEee_D4EhwjboOQ" supplier="_P-MkYBVaEee_D4EhwjboOQ" contract="_P-MkYBVaEee_D4EhwjboOQ"/> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_2GdzIBXiEee_D4EhwjboOQ" name="OrExpression"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_BwX1ghXjEee_D4EhwjboOQ" name="ownedExpressions" type="_P-MkYBVaEee_D4EhwjboOQ" aggregation="composite" association="_BwWAUBXjEee_D4EhwjboOQ"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GHAekBXjEee_D4EhwjboOQ"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GHQWMBXjEee_D4EhwjboOQ" value="*"/> - </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_ltwD4Bn2EeeYEuQJkmbFAA" name="referencedExpressions" type="_P-MkYBVaEee_D4EhwjboOQ" association="_ltsZgBn2EeeYEuQJkmbFAA"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cHlugI6yEemjwpaBkaWY0Q" source="http://www.eclipse.org/emf/2002/GenModel"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cHlugY6yEemjwpaBkaWY0Q" key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/expressions/multiBooleanExpressionsReference"/> - </eAnnotations> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rHd6kBn2EeeYEuQJkmbFAA"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rHlPUBn2EeeYEuQJkmbFAA" value="*"/> - </ownedAttribute> - <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_p9NF0BXjEee_D4EhwjboOQ" client="_2GdzIBXiEee_D4EhwjboOQ" supplier="_P-MkYBVaEee_D4EhwjboOQ" contract="_P-MkYBVaEee_D4EhwjboOQ"/> + <generalization xmi:type="uml:Generalization" xmi:id="_nTgLEJHYEemkbNOY_7-CZA" general="_RqUHAJHWEemkbNOY_7-CZA"/> + <generalization xmi:type="uml:Generalization" xmi:id="_s-gmEJHYEemkbNOY_7-CZA" general="_16D2sJHWEemkbNOY_7-CZA"/> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_3NcCQBXiEee_D4EhwjboOQ" name="NotExpression"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_44dZoRXiEee_D4EhwjboOQ" name="ownedExpression" type="_P-MkYBVaEee_D4EhwjboOQ" aggregation="composite" association="_44cLgBXiEee_D4EhwjboOQ"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9yRM0Bn2EeeYEuQJkmbFAA"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9ytRsBn2EeeYEuQJkmbFAA" value="1"/> - </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_nhG34Bn2EeeYEuQJkmbFAA" name="referencedExpression" type="_P-MkYBVaEee_D4EhwjboOQ" association="_nhEboBn2EeeYEuQJkmbFAA"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bZhuoI6yEemjwpaBkaWY0Q" source="http://www.eclipse.org/emf/2002/GenModel"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bZhuoY6yEemjwpaBkaWY0Q" key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/expressions/singleBooleanExpressionReference"/> - </eAnnotations> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-gm5gBn2EeeYEuQJkmbFAA"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-htswBn2EeeYEuQJkmbFAA" value="1"/> - </ownedAttribute> - <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_JtfdEBXjEee_D4EhwjboOQ" client="_3NcCQBXiEee_D4EhwjboOQ" supplier="_P-MkYBVaEee_D4EhwjboOQ" contract="_P-MkYBVaEee_D4EhwjboOQ"/> - </packagedElement> - <packagedElement xmi:type="uml:Association" xmi:id="_44cLgBXiEee_D4EhwjboOQ" memberEnd="_44dZoRXiEee_D4EhwjboOQ _44eAsBXiEee_D4EhwjboOQ"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_44cykBXiEee_D4EhwjboOQ" source="org.eclipse.papyrus"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_44dZoBXiEee_D4EhwjboOQ" key="nature" value="UML_Nature"/> - </eAnnotations> - <ownedEnd xmi:type="uml:Property" xmi:id="_44eAsBXiEee_D4EhwjboOQ" name="notexpression" type="_3NcCQBXiEee_D4EhwjboOQ" association="_44cLgBXiEee_D4EhwjboOQ"/> - </packagedElement> - <packagedElement xmi:type="uml:Association" xmi:id="_BwWAUBXjEee_D4EhwjboOQ" memberEnd="_BwX1ghXjEee_D4EhwjboOQ _BwiNkBXjEee_D4EhwjboOQ"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BwX1gBXjEee_D4EhwjboOQ" source="org.eclipse.papyrus"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BwX1gRXjEee_D4EhwjboOQ" key="nature" value="UML_Nature"/> - </eAnnotations> - <ownedEnd xmi:type="uml:Property" xmi:id="_BwiNkBXjEee_D4EhwjboOQ" name="orexpression" type="_2GdzIBXiEee_D4EhwjboOQ" association="_BwWAUBXjEee_D4EhwjboOQ"/> + <generalization xmi:type="uml:Generalization" xmi:id="_yNmhIJHYEemkbNOY_7-CZA" general="_vbWt4JHWEemkbNOY_7-CZA"/> + <generalization xmi:type="uml:Generalization" xmi:id="_1TDPIJHYEemkbNOY_7-CZA" general="_fidikJHWEemkbNOY_7-CZA"/> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_sckEMBXjEee_D4EhwjboOQ" name="LiteralFalseExpression"> <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_w6Uo8BXjEee_D4EhwjboOQ" client="_sckEMBXjEee_D4EhwjboOQ" supplier="_P-MkYBVaEee_D4EhwjboOQ" contract="_P-MkYBVaEee_D4EhwjboOQ"/> </packagedElement> - <packagedElement xmi:type="uml:Association" xmi:id="_ltsZgBn2EeeYEuQJkmbFAA" memberEnd="_ltwD4Bn2EeeYEuQJkmbFAA _ltwD4Rn2EeeYEuQJkmbFAA"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ltvc0Bn2EeeYEuQJkmbFAA" source="org.eclipse.papyrus"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ltvc0Rn2EeeYEuQJkmbFAA" key="nature" value="UML_Nature"/> - </eAnnotations> - <ownedEnd xmi:type="uml:Property" xmi:id="_ltwD4Rn2EeeYEuQJkmbFAA" name="orexpression" type="_2GdzIBXiEee_D4EhwjboOQ" association="_ltsZgBn2EeeYEuQJkmbFAA"/> - </packagedElement> - <packagedElement xmi:type="uml:Association" xmi:id="_mbLxoBn2EeeYEuQJkmbFAA" memberEnd="_mbMYshn2EeeYEuQJkmbFAA _mbM_wBn2EeeYEuQJkmbFAA"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mbMYsBn2EeeYEuQJkmbFAA" source="org.eclipse.papyrus"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mbMYsRn2EeeYEuQJkmbFAA" key="nature" value="UML_Nature"/> - </eAnnotations> - <ownedEnd xmi:type="uml:Property" xmi:id="_mbM_wBn2EeeYEuQJkmbFAA" name="andexpression" type="_WpVKMBVbEee_D4EhwjboOQ" association="_mbLxoBn2EeeYEuQJkmbFAA"/> - </packagedElement> - <packagedElement xmi:type="uml:Association" xmi:id="_nhEboBn2EeeYEuQJkmbFAA" memberEnd="_nhG34Bn2EeeYEuQJkmbFAA _nhHe8Bn2EeeYEuQJkmbFAA"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nhFpwBn2EeeYEuQJkmbFAA" source="org.eclipse.papyrus"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nhGQ0Bn2EeeYEuQJkmbFAA" key="nature" value="UML_Nature"/> - </eAnnotations> - <ownedEnd xmi:type="uml:Property" xmi:id="_nhHe8Bn2EeeYEuQJkmbFAA" name="notexpression" type="_3NcCQBXiEee_D4EhwjboOQ" association="_nhEboBn2EeeYEuQJkmbFAA"/> - </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_oU_pgBrTEeeJdcoPLKQK3g" name="ReferenceBooleanExpression"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uWcIkJD3EembtcUdk7EePw" source="http://www.eclipse.org/emf/2002/GenModel"> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uWcIkZD3EembtcUdk7EePw" key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/expressions/singleBooleanExpressionReference"/> </eAnnotations> - <ownedAttribute xmi:type="uml:Property" xmi:id="_rnZOYBrTEeeJdcoPLKQK3g" name="referencedExpression" type="_P-MkYBVaEee_D4EhwjboOQ" association="_rnWLEBrTEeeJdcoPLKQK3g"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_H0rjgBrUEeeJdcoPLKQK3g"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_H1QyUBrUEeeJdcoPLKQK3g" value="1"/> - </ownedAttribute> - <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_98AYwBrUEeeJdcoPLKQK3g" client="_oU_pgBrTEeeJdcoPLKQK3g" supplier="_P-MkYBVaEee_D4EhwjboOQ" contract="_P-MkYBVaEee_D4EhwjboOQ"/> - </packagedElement> - <packagedElement xmi:type="uml:Association" xmi:id="_rnWLEBrTEeeJdcoPLKQK3g" memberEnd="_rnZOYBrTEeeJdcoPLKQK3g _rnZ1cBrTEeeJdcoPLKQK3g"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rnYnUBrTEeeJdcoPLKQK3g" source="org.eclipse.papyrus"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rnYnURrTEeeJdcoPLKQK3g" key="nature" value="UML_Nature"/> - </eAnnotations> - <ownedEnd xmi:type="uml:Property" xmi:id="_rnZ1cBrTEeeJdcoPLKQK3g" name="booleanexpressionreference" type="_oU_pgBrTEeeJdcoPLKQK3g" association="_rnWLEBrTEeeJdcoPLKQK3g"/> + <generalization xmi:type="uml:Generalization" xmi:id="_4K3w0JHYEemkbNOY_7-CZA" general="_fidikJHWEemkbNOY_7-CZA"/> </packagedElement> <packagedElement xmi:type="uml:Interface" xmi:id="_yFQYgBtpEeeNbZVCoqtPGQ" name="IBooleanExpression"> <templateBinding xmi:type="uml:TemplateBinding" xmi:id="_1nV_MBtpEeeNbZVCoqtPGQ" signature="_mhY58BVZEee_D4EhwjboOQ"> @@ -228,6 +152,64 @@ This expression returns false in all cases, expected when the expectedValue is e </ownedAttribute> <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_NBlw4I3PEemaCNM_5JlkJw" client="_sIyu4I3OEemaCNM_5JlkJw" supplier="_P-MkYBVaEee_D4EhwjboOQ" contract="_P-MkYBVaEee_D4EhwjboOQ"/> </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_RqUHAJHWEemkbNOY_7-CZA" name="AbtractMultiBooleanEObjectExpressionsOwnedExpression" isAbstract="true"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_CfNj4JHYEemkbNOY_7-CZA" name="ownedExpressions" type="_P-MkYBVaEee_D4EhwjboOQ" aggregation="composite" association="_CfEZ8JHYEemkbNOY_7-CZA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CfOK8JHYEemkbNOY_7-CZA"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CfOK8ZHYEemkbNOY_7-CZA" value="*"/> + </ownedAttribute> + <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_tpYkgJHXEemkbNOY_7-CZA" client="_RqUHAJHWEemkbNOY_7-CZA" supplier="_P-MkYBVaEee_D4EhwjboOQ" contract="_P-MkYBVaEee_D4EhwjboOQ"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_fidikJHWEemkbNOY_7-CZA" name="AbstractSingleBooleanEObjectExpressionReferenceExpression" isAbstract="true"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_ade64JHYEemkbNOY_7-CZA" name="referencedExpression" type="_P-MkYBVaEee_D4EhwjboOQ" association="_addFsJHYEemkbNOY_7-CZA"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dLAR0JJsEemkbNOY_7-CZA" source="http://www.eclipse.org/emf/2002/GenModel"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_guXq4JJsEemkbNOY_7-CZA" key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/expressions/SingleBooleanEObjectExpressionReferenceExpression/referencedExpression"/> + </eAnnotations> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_adfh8JHYEemkbNOY_7-CZA"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_adgJAJHYEemkbNOY_7-CZA" value="1"/> + </ownedAttribute> + <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_tpADYJJuEemkbNOY_7-CZA" client="_fidikJHWEemkbNOY_7-CZA" supplier="_P-MkYBVaEee_D4EhwjboOQ" contract="_P-MkYBVaEee_D4EhwjboOQ"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_vbWt4JHWEemkbNOY_7-CZA" name="AbstractSingleBooleanEObjectExpressionOwnedExpression" isAbstract="true"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_gX8HIZHYEemkbNOY_7-CZA" name="ownedExpression" type="_P-MkYBVaEee_D4EhwjboOQ" aggregation="composite" association="_gX6R8JHYEemkbNOY_7-CZA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gX8uMJHYEemkbNOY_7-CZA"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gX9VQJHYEemkbNOY_7-CZA" value="1"/> + </ownedAttribute> + <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_-YK2AJHXEemkbNOY_7-CZA" client="_vbWt4JHWEemkbNOY_7-CZA" supplier="_P-MkYBVaEee_D4EhwjboOQ" contract="_P-MkYBVaEee_D4EhwjboOQ"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_16D2sJHWEemkbNOY_7-CZA" name="AbstractMultiBooleanEObjectExpressionsReferenceExpression" isAbstract="true"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_OwPQoJHYEemkbNOY_7-CZA" name="referencedExpressions" type="_P-MkYBVaEee_D4EhwjboOQ" association="_OwLmQJHYEemkbNOY_7-CZA"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yg87sJJsEemkbNOY_7-CZA" source="http://www.eclipse.org/emf/2002/GenModel"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yg87sZJsEemkbNOY_7-CZA" key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/expressions/MultiBooleanEObjectExpressionsReferenceExpression/referencedExpressions"/> + </eAnnotations> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SkDggJHYEemkbNOY_7-CZA"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SeYWUJHYEemkbNOY_7-CZA" value="*"/> + </ownedAttribute> + <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_3ODYsJHXEemkbNOY_7-CZA" client="_16D2sJHWEemkbNOY_7-CZA" supplier="_P-MkYBVaEee_D4EhwjboOQ" contract="_P-MkYBVaEee_D4EhwjboOQ"/> + </packagedElement> + <packagedElement xmi:type="uml:Association" xmi:id="_CfEZ8JHYEemkbNOY_7-CZA" memberEnd="_CfNj4JHYEemkbNOY_7-CZA _CfOyAJHYEemkbNOY_7-CZA"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CfKgkJHYEemkbNOY_7-CZA" source="org.eclipse.papyrus"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CfLHoJHYEemkbNOY_7-CZA" key="nature" value="UML_Nature"/> + </eAnnotations> + <ownedEnd xmi:type="uml:Property" xmi:id="_CfOyAJHYEemkbNOY_7-CZA" name="abtractmultibooleaneobjectexpressionscontainmentexpression" type="_RqUHAJHWEemkbNOY_7-CZA" association="_CfEZ8JHYEemkbNOY_7-CZA"/> + </packagedElement> + <packagedElement xmi:type="uml:Association" xmi:id="_OwLmQJHYEemkbNOY_7-CZA" memberEnd="_OwPQoJHYEemkbNOY_7-CZA _OwQewJHYEemkbNOY_7-CZA"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OwOpkJHYEemkbNOY_7-CZA" source="org.eclipse.papyrus"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OwOpkZHYEemkbNOY_7-CZA" key="nature" value="UML_Nature"/> + </eAnnotations> + <ownedEnd xmi:type="uml:Property" xmi:id="_OwQewJHYEemkbNOY_7-CZA" name="abstractmultibooleaneobjectexpressionsreferenceexpression" type="_16D2sJHWEemkbNOY_7-CZA" association="_OwLmQJHYEemkbNOY_7-CZA"/> + </packagedElement> + <packagedElement xmi:type="uml:Association" xmi:id="_addFsJHYEemkbNOY_7-CZA" memberEnd="_ade64JHYEemkbNOY_7-CZA _adgwEJHYEemkbNOY_7-CZA"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_adeT0JHYEemkbNOY_7-CZA" source="org.eclipse.papyrus"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_adeT0ZHYEemkbNOY_7-CZA" key="nature" value="UML_Nature"/> + </eAnnotations> + <ownedEnd xmi:type="uml:Property" xmi:id="_adgwEJHYEemkbNOY_7-CZA" name="abstractsinglebooleaneobjectexpressionreferenceexpression" type="_fidikJHWEemkbNOY_7-CZA" association="_addFsJHYEemkbNOY_7-CZA"/> + </packagedElement> + <packagedElement xmi:type="uml:Association" xmi:id="_gX6R8JHYEemkbNOY_7-CZA" memberEnd="_gX8HIZHYEemkbNOY_7-CZA _gX9VQZHYEemkbNOY_7-CZA"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gX7gEJHYEemkbNOY_7-CZA" source="org.eclipse.papyrus"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gX8HIJHYEemkbNOY_7-CZA" key="nature" value="UML_Nature"/> + </eAnnotations> + <ownedEnd xmi:type="uml:Property" xmi:id="_gX9VQZHYEemkbNOY_7-CZA" name="abstractsinglebooleaneobjectexpressionownedexpression" type="_vbWt4JHWEemkbNOY_7-CZA" association="_gX6R8JHYEemkbNOY_7-CZA"/> + </packagedElement> </packagedElement> <packagedElement xmi:type="uml:Interface" xmi:id="_-hQYgBqgEeex7OKxnYgv8Q" name="IBasicExpressionElement"> <ownedAttribute xmi:type="uml:Property" xmi:id="_6fy8MBUkEee_D4EhwjboOQ" name="name"> diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AbstractMultiBooleanEObjectExpressionsReferenceExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AbstractMultiBooleanEObjectExpressionsReferenceExpression.java new file mode 100755 index 00000000000..0601c740fa7 --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AbstractMultiBooleanEObjectExpressionsReferenceExpression.java @@ -0,0 +1,51 @@ +/** + * Copyright (c) 2017 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + */ +package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions; + +import org.eclipse.emf.common.util.EList; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Abstract Multi Boolean EObject Expressions Reference Expression</b></em>'. + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractMultiBooleanEObjectExpressionsReferenceExpression#getReferencedExpressions <em>Referenced Expressions</em>}</li> + * </ul> + * + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getAbstractMultiBooleanEObjectExpressionsReferenceExpression() + * @model abstract="true" + * @generated + */ +public interface AbstractMultiBooleanEObjectExpressionsReferenceExpression extends IBooleanEObjectExpression { + /** + * Returns the value of the '<em><b>Referenced Expressions</b></em>' reference list. + * The list contents are of type {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Referenced Expressions</em>' reference list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Referenced Expressions</em>' reference list. + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getAbstractMultiBooleanEObjectExpressionsReferenceExpression_ReferencedExpressions() + * @model ordered="false" + * @generated + */ + EList<IBooleanEObjectExpression> getReferencedExpressions(); + +} // AbstractMultiBooleanEObjectExpressionsReferenceExpression diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AbstractSingleBooleanEObjectExpressionOwnedExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AbstractSingleBooleanEObjectExpressionOwnedExpression.java new file mode 100755 index 00000000000..90149c279dd --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AbstractSingleBooleanEObjectExpressionOwnedExpression.java @@ -0,0 +1,60 @@ +/** + * Copyright (c) 2017 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + */ +package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions; + + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Abstract Single Boolean EObject Expression Owned Expression</b></em>'. + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionOwnedExpression#getOwnedExpression <em>Owned Expression</em>}</li> + * </ul> + * + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getAbstractSingleBooleanEObjectExpressionOwnedExpression() + * @model abstract="true" + * @generated + */ +public interface AbstractSingleBooleanEObjectExpressionOwnedExpression extends IBooleanEObjectExpression { + /** + * Returns the value of the '<em><b>Owned Expression</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Owned Expression</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Owned Expression</em>' containment reference. + * @see #setOwnedExpression(IBooleanEObjectExpression) + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getAbstractSingleBooleanEObjectExpressionOwnedExpression_OwnedExpression() + * @model containment="true" ordered="false" + * @generated + */ + IBooleanEObjectExpression getOwnedExpression(); + + /** + * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionOwnedExpression#getOwnedExpression <em>Owned Expression</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Owned Expression</em>' containment reference. + * @see #getOwnedExpression() + * @generated + */ + void setOwnedExpression(IBooleanEObjectExpression value); + +} // AbstractSingleBooleanEObjectExpressionOwnedExpression diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AbstractSingleBooleanEObjectExpressionReferenceExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AbstractSingleBooleanEObjectExpressionReferenceExpression.java new file mode 100755 index 00000000000..ea1eb3d2710 --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AbstractSingleBooleanEObjectExpressionReferenceExpression.java @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2017 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + */ +package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Abstract Single Boolean EObject Expression Reference Expression</b></em>'. + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionReferenceExpression#getReferencedExpression <em>Referenced Expression</em>}</li> + * </ul> + * + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getAbstractSingleBooleanEObjectExpressionReferenceExpression() + * @model abstract="true" + * @generated + */ +public interface AbstractSingleBooleanEObjectExpressionReferenceExpression extends IBooleanEObjectExpression { + /** + * Returns the value of the '<em><b>Referenced Expression</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Referenced Expression</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Referenced Expression</em>' reference. + * @see #setReferencedExpression(IBooleanEObjectExpression) + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getAbstractSingleBooleanEObjectExpressionReferenceExpression_ReferencedExpression() + * @model ordered="false" + * @generated + */ + IBooleanEObjectExpression getReferencedExpression(); + + /** + * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionReferenceExpression#getReferencedExpression <em>Referenced Expression</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Referenced Expression</em>' reference. + * @see #getReferencedExpression() + * @generated + */ + void setReferencedExpression(IBooleanEObjectExpression value); + +} // AbstractSingleBooleanEObjectExpressionReferenceExpression diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AbtractMultiBooleanEObjectExpressionsOwnedExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AbtractMultiBooleanEObjectExpressionsOwnedExpression.java new file mode 100755 index 00000000000..0126caae402 --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AbtractMultiBooleanEObjectExpressionsOwnedExpression.java @@ -0,0 +1,51 @@ +/** + * Copyright (c) 2017 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + */ +package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions; + +import org.eclipse.emf.common.util.EList; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Abtract Multi Boolean EObject Expressions Owned Expression</b></em>'. + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbtractMultiBooleanEObjectExpressionsOwnedExpression#getOwnedExpressions <em>Owned Expressions</em>}</li> + * </ul> + * + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getAbtractMultiBooleanEObjectExpressionsOwnedExpression() + * @model abstract="true" + * @generated + */ +public interface AbtractMultiBooleanEObjectExpressionsOwnedExpression extends IBooleanEObjectExpression { + /** + * Returns the value of the '<em><b>Owned Expressions</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Owned Expressions</em>' containment reference list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Owned Expressions</em>' containment reference list. + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getAbtractMultiBooleanEObjectExpressionsOwnedExpression_OwnedExpressions() + * @model containment="true" ordered="false" + * @generated + */ + EList<IBooleanEObjectExpression> getOwnedExpressions(); + +} // AbtractMultiBooleanEObjectExpressionsOwnedExpression diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AndExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AndExpression.java index 4417c4126bd..5d9b3a85521 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AndExpression.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/AndExpression.java @@ -13,8 +13,6 @@ */ package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions; -import org.eclipse.emf.common.util.EList; - /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>And Expression</b></em>'. @@ -26,49 +24,11 @@ import org.eclipse.emf.common.util.EList; * otherwize we return the OR between all owned and referenced expressions * <!-- end-model-doc --> * - * <p> - * The following features are supported: - * </p> - * <ul> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression#getOwnedExpressions <em>Owned Expressions</em>}</li> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression#getReferencedExpressions <em>Referenced Expressions</em>}</li> - * </ul> * * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getAndExpression() * @model * @generated */ -public interface AndExpression extends IBooleanEObjectExpression { - /** - * Returns the value of the '<em><b>Owned Expressions</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Owned Expressions</em>' containment reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Owned Expressions</em>' containment reference list. - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getAndExpression_OwnedExpressions() - * @model containment="true" ordered="false" - * @generated - */ - EList<IBooleanEObjectExpression> getOwnedExpressions(); - - /** - * Returns the value of the '<em><b>Referenced Expressions</b></em>' reference list. - * The list contents are of type {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Referenced Expressions</em>' reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Referenced Expressions</em>' reference list. - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getAndExpression_ReferencedExpressions() - * @model ordered="false" - * @generated - */ - EList<IBooleanEObjectExpression> getReferencedExpressions(); +public interface AndExpression extends AbstractMultiBooleanEObjectExpressionsReferenceExpression, AbtractMultiBooleanEObjectExpressionsOwnedExpression { } // AndExpression diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/BooleanExpressionsPackage.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/BooleanExpressionsPackage.java index b9c51c1c529..645e0b0a6be 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/BooleanExpressionsPackage.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/BooleanExpressionsPackage.java @@ -78,7 +78,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getIBooleanExpression() * @generated */ - int IBOOLEAN_EXPRESSION = 2; + int IBOOLEAN_EXPRESSION = 3; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -133,7 +133,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getIBooleanEObjectExpression() * @generated */ - int IBOOLEAN_EOBJECT_EXPRESSION = 1; + int IBOOLEAN_EOBJECT_EXPRESSION = 2; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -181,6 +181,70 @@ public interface BooleanExpressionsPackage extends EPackage { int IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT = IBOOLEAN_EXPRESSION_OPERATION_COUNT + 0; /** + * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractMultiBooleanEObjectExpressionsReferenceExpressionImpl <em>Abstract Multi Boolean EObject Expressions Reference Expression</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractMultiBooleanEObjectExpressionsReferenceExpressionImpl + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getAbstractMultiBooleanEObjectExpressionsReferenceExpression() + * @generated + */ + int ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION = 4; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__NAME = IBOOLEAN_EOBJECT_EXPRESSION__NAME; + + /** + * The feature id for the '<em><b>Description</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__DESCRIPTION = IBOOLEAN_EOBJECT_EXPRESSION__DESCRIPTION; + + /** + * The feature id for the '<em><b>Referenced Expressions</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__REFERENCED_EXPRESSIONS = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>Abstract Multi Boolean EObject Expressions Reference Expression</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION_FEATURE_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1; + + /** + * The operation id for the '<em>Evaluate</em>' operation. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION___EVALUATE__OBJECT = IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT; + + /** + * The number of operations of the '<em>Abstract Multi Boolean EObject Expressions Reference Expression</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION_OPERATION_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.OrExpressionImpl <em>Or Expression</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -197,7 +261,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int OR_EXPRESSION__NAME = IBOOLEAN_EOBJECT_EXPRESSION__NAME; + int OR_EXPRESSION__NAME = ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__NAME; /** * The feature id for the '<em><b>Description</b></em>' attribute. @@ -206,25 +270,25 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int OR_EXPRESSION__DESCRIPTION = IBOOLEAN_EOBJECT_EXPRESSION__DESCRIPTION; + int OR_EXPRESSION__DESCRIPTION = ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__DESCRIPTION; /** - * The feature id for the '<em><b>Owned Expressions</b></em>' containment reference list. + * The feature id for the '<em><b>Referenced Expressions</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int OR_EXPRESSION__OWNED_EXPRESSIONS = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 0; + int OR_EXPRESSION__REFERENCED_EXPRESSIONS = ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__REFERENCED_EXPRESSIONS; /** - * The feature id for the '<em><b>Referenced Expressions</b></em>' reference list. + * The feature id for the '<em><b>Owned Expressions</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int OR_EXPRESSION__REFERENCED_EXPRESSIONS = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1; + int OR_EXPRESSION__OWNED_EXPRESSIONS = ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION_FEATURE_COUNT + 0; /** * The number of structural features of the '<em>Or Expression</em>' class. @@ -233,7 +297,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int OR_EXPRESSION_FEATURE_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 2; + int OR_EXPRESSION_FEATURE_COUNT = ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION_FEATURE_COUNT + 1; /** * The operation id for the '<em>Evaluate</em>' operation. @@ -242,7 +306,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int OR_EXPRESSION___EVALUATE__OBJECT = IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT; + int OR_EXPRESSION___EVALUATE__OBJECT = ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION___EVALUATE__OBJECT; /** * The number of operations of the '<em>Or Expression</em>' class. @@ -251,7 +315,71 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int OR_EXPRESSION_OPERATION_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; + int OR_EXPRESSION_OPERATION_COUNT = ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbtractMultiBooleanEObjectExpressionsOwnedExpressionImpl <em>Abtract Multi Boolean EObject Expressions Owned Expression</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbtractMultiBooleanEObjectExpressionsOwnedExpressionImpl + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getAbtractMultiBooleanEObjectExpressionsOwnedExpression() + * @generated + */ + int ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION = 1; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__NAME = IBOOLEAN_EOBJECT_EXPRESSION__NAME; + + /** + * The feature id for the '<em><b>Description</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__DESCRIPTION = IBOOLEAN_EOBJECT_EXPRESSION__DESCRIPTION; + + /** + * The feature id for the '<em><b>Owned Expressions</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>Abtract Multi Boolean EObject Expressions Owned Expression</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION_FEATURE_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1; + + /** + * The operation id for the '<em>Evaluate</em>' operation. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION___EVALUATE__OBJECT = IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT; + + /** + * The number of operations of the '<em>Abtract Multi Boolean EObject Expressions Owned Expression</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION_OPERATION_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl <em>And Expression</em>}' class. @@ -261,7 +389,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getAndExpression() * @generated */ - int AND_EXPRESSION = 3; + int AND_EXPRESSION = 5; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -270,7 +398,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int AND_EXPRESSION__NAME = IBOOLEAN_EOBJECT_EXPRESSION__NAME; + int AND_EXPRESSION__NAME = ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__NAME; /** * The feature id for the '<em><b>Description</b></em>' attribute. @@ -279,25 +407,25 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int AND_EXPRESSION__DESCRIPTION = IBOOLEAN_EOBJECT_EXPRESSION__DESCRIPTION; + int AND_EXPRESSION__DESCRIPTION = ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__DESCRIPTION; /** - * The feature id for the '<em><b>Owned Expressions</b></em>' containment reference list. + * The feature id for the '<em><b>Referenced Expressions</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int AND_EXPRESSION__OWNED_EXPRESSIONS = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 0; + int AND_EXPRESSION__REFERENCED_EXPRESSIONS = ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__REFERENCED_EXPRESSIONS; /** - * The feature id for the '<em><b>Referenced Expressions</b></em>' reference list. + * The feature id for the '<em><b>Owned Expressions</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int AND_EXPRESSION__REFERENCED_EXPRESSIONS = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1; + int AND_EXPRESSION__OWNED_EXPRESSIONS = ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION_FEATURE_COUNT + 0; /** * The number of structural features of the '<em>And Expression</em>' class. @@ -306,7 +434,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int AND_EXPRESSION_FEATURE_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 2; + int AND_EXPRESSION_FEATURE_COUNT = ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION_FEATURE_COUNT + 1; /** * The operation id for the '<em>Evaluate</em>' operation. @@ -315,7 +443,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int AND_EXPRESSION___EVALUATE__OBJECT = IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT; + int AND_EXPRESSION___EVALUATE__OBJECT = ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION___EVALUATE__OBJECT; /** * The number of operations of the '<em>And Expression</em>' class. @@ -324,7 +452,71 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int AND_EXPRESSION_OPERATION_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; + int AND_EXPRESSION_OPERATION_COUNT = ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractSingleBooleanEObjectExpressionOwnedExpressionImpl <em>Abstract Single Boolean EObject Expression Owned Expression</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractSingleBooleanEObjectExpressionOwnedExpressionImpl + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getAbstractSingleBooleanEObjectExpressionOwnedExpression() + * @generated + */ + int ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION = 7; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__NAME = IBOOLEAN_EOBJECT_EXPRESSION__NAME; + + /** + * The feature id for the '<em><b>Description</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__DESCRIPTION = IBOOLEAN_EOBJECT_EXPRESSION__DESCRIPTION; + + /** + * The feature id for the '<em><b>Owned Expression</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>Abstract Single Boolean EObject Expression Owned Expression</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION_FEATURE_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1; + + /** + * The operation id for the '<em>Evaluate</em>' operation. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION___EVALUATE__OBJECT = IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT; + + /** + * The number of operations of the '<em>Abstract Single Boolean EObject Expression Owned Expression</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION_OPERATION_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.NotExpressionImpl <em>Not Expression</em>}' class. @@ -334,7 +526,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getNotExpression() * @generated */ - int NOT_EXPRESSION = 4; + int NOT_EXPRESSION = 6; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -343,7 +535,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int NOT_EXPRESSION__NAME = IBOOLEAN_EOBJECT_EXPRESSION__NAME; + int NOT_EXPRESSION__NAME = ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__NAME; /** * The feature id for the '<em><b>Description</b></em>' attribute. @@ -352,7 +544,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int NOT_EXPRESSION__DESCRIPTION = IBOOLEAN_EOBJECT_EXPRESSION__DESCRIPTION; + int NOT_EXPRESSION__DESCRIPTION = ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__DESCRIPTION; /** * The feature id for the '<em><b>Owned Expression</b></em>' containment reference. @@ -361,7 +553,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int NOT_EXPRESSION__OWNED_EXPRESSION = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 0; + int NOT_EXPRESSION__OWNED_EXPRESSION = ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION; /** * The feature id for the '<em><b>Referenced Expression</b></em>' reference. @@ -370,7 +562,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int NOT_EXPRESSION__REFERENCED_EXPRESSION = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1; + int NOT_EXPRESSION__REFERENCED_EXPRESSION = ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION_FEATURE_COUNT + 0; /** * The number of structural features of the '<em>Not Expression</em>' class. @@ -379,7 +571,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int NOT_EXPRESSION_FEATURE_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 2; + int NOT_EXPRESSION_FEATURE_COUNT = ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION_FEATURE_COUNT + 1; /** * The operation id for the '<em>Evaluate</em>' operation. @@ -388,7 +580,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int NOT_EXPRESSION___EVALUATE__OBJECT = IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT; + int NOT_EXPRESSION___EVALUATE__OBJECT = ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION___EVALUATE__OBJECT; /** * The number of operations of the '<em>Not Expression</em>' class. @@ -397,7 +589,71 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int NOT_EXPRESSION_OPERATION_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; + int NOT_EXPRESSION_OPERATION_COUNT = ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractSingleBooleanEObjectExpressionReferenceExpressionImpl <em>Abstract Single Boolean EObject Expression Reference Expression</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractSingleBooleanEObjectExpressionReferenceExpressionImpl + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getAbstractSingleBooleanEObjectExpressionReferenceExpression() + * @generated + */ + int ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION = 8; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__NAME = IBOOLEAN_EOBJECT_EXPRESSION__NAME; + + /** + * The feature id for the '<em><b>Description</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__DESCRIPTION = IBOOLEAN_EOBJECT_EXPRESSION__DESCRIPTION; + + /** + * The feature id for the '<em><b>Referenced Expression</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__REFERENCED_EXPRESSION = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>Abstract Single Boolean EObject Expression Reference Expression</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION_FEATURE_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1; + + /** + * The operation id for the '<em>Evaluate</em>' operation. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION___EVALUATE__OBJECT = IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT; + + /** + * The number of operations of the '<em>Abstract Single Boolean EObject Expression Reference Expression</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION_OPERATION_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralTrueExpressionImpl <em>Literal True Expression</em>}' class. @@ -407,7 +663,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getLiteralTrueExpression() * @generated */ - int LITERAL_TRUE_EXPRESSION = 5; + int LITERAL_TRUE_EXPRESSION = 9; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -462,7 +718,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getLiteralFalseExpression() * @generated */ - int LITERAL_FALSE_EXPRESSION = 6; + int LITERAL_FALSE_EXPRESSION = 10; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -517,7 +773,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getReferenceBooleanExpression() * @generated */ - int REFERENCE_BOOLEAN_EXPRESSION = 7; + int REFERENCE_BOOLEAN_EXPRESSION = 11; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -526,7 +782,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int REFERENCE_BOOLEAN_EXPRESSION__NAME = IBOOLEAN_EOBJECT_EXPRESSION__NAME; + int REFERENCE_BOOLEAN_EXPRESSION__NAME = ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__NAME; /** * The feature id for the '<em><b>Description</b></em>' attribute. @@ -535,7 +791,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION = IBOOLEAN_EOBJECT_EXPRESSION__DESCRIPTION; + int REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION = ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__DESCRIPTION; /** * The feature id for the '<em><b>Referenced Expression</b></em>' reference. @@ -544,7 +800,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 0; + int REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION = ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__REFERENCED_EXPRESSION; /** * The number of structural features of the '<em>Reference Boolean Expression</em>' class. @@ -553,7 +809,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int REFERENCE_BOOLEAN_EXPRESSION_FEATURE_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1; + int REFERENCE_BOOLEAN_EXPRESSION_FEATURE_COUNT = ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION_FEATURE_COUNT + 0; /** * The operation id for the '<em>Evaluate</em>' operation. @@ -562,7 +818,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int REFERENCE_BOOLEAN_EXPRESSION___EVALUATE__OBJECT = IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT; + int REFERENCE_BOOLEAN_EXPRESSION___EVALUATE__OBJECT = ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION___EVALUATE__OBJECT; /** * The number of operations of the '<em>Reference Boolean Expression</em>' class. @@ -571,7 +827,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @generated * @ordered */ - int REFERENCE_BOOLEAN_EXPRESSION_OPERATION_COUNT = IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; + int REFERENCE_BOOLEAN_EXPRESSION_OPERATION_COUNT = ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.SingleEAttributeValueEqualityExpressionImpl <em>Single EAttribute Value Equality Expression</em>}' class. @@ -581,7 +837,7 @@ public interface BooleanExpressionsPackage extends EPackage { * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getSingleEAttributeValueEqualityExpression() * @generated */ - int SINGLE_EATTRIBUTE_VALUE_EQUALITY_EXPRESSION = 8; + int SINGLE_EATTRIBUTE_VALUE_EQUALITY_EXPRESSION = 12; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -658,26 +914,25 @@ public interface BooleanExpressionsPackage extends EPackage { EClass getOrExpression(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression#getOwnedExpressions <em>Owned Expressions</em>}'. + * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbtractMultiBooleanEObjectExpressionsOwnedExpression <em>Abtract Multi Boolean EObject Expressions Owned Expression</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Owned Expressions</em>'. - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression#getOwnedExpressions() - * @see #getOrExpression() + * @return the meta object for class '<em>Abtract Multi Boolean EObject Expressions Owned Expression</em>'. + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbtractMultiBooleanEObjectExpressionsOwnedExpression * @generated */ - EReference getOrExpression_OwnedExpressions(); + EClass getAbtractMultiBooleanEObjectExpressionsOwnedExpression(); /** - * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression#getReferencedExpressions <em>Referenced Expressions</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbtractMultiBooleanEObjectExpressionsOwnedExpression#getOwnedExpressions <em>Owned Expressions</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Referenced Expressions</em>'. - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression#getReferencedExpressions() - * @see #getOrExpression() + * @return the meta object for the containment reference list '<em>Owned Expressions</em>'. + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbtractMultiBooleanEObjectExpressionsOwnedExpression#getOwnedExpressions() + * @see #getAbtractMultiBooleanEObjectExpressionsOwnedExpression() * @generated */ - EReference getOrExpression_ReferencedExpressions(); + EReference getAbtractMultiBooleanEObjectExpressionsOwnedExpression_OwnedExpressions(); /** * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression <em>IBoolean EObject Expression</em>}'. @@ -700,36 +955,35 @@ public interface BooleanExpressionsPackage extends EPackage { EClass getIBooleanExpression(); /** - * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression <em>And Expression</em>}'. + * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractMultiBooleanEObjectExpressionsReferenceExpression <em>Abstract Multi Boolean EObject Expressions Reference Expression</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>And Expression</em>'. - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression + * @return the meta object for class '<em>Abstract Multi Boolean EObject Expressions Reference Expression</em>'. + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractMultiBooleanEObjectExpressionsReferenceExpression * @generated */ - EClass getAndExpression(); + EClass getAbstractMultiBooleanEObjectExpressionsReferenceExpression(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression#getOwnedExpressions <em>Owned Expressions</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractMultiBooleanEObjectExpressionsReferenceExpression#getReferencedExpressions <em>Referenced Expressions</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Owned Expressions</em>'. - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression#getOwnedExpressions() - * @see #getAndExpression() + * @return the meta object for the reference list '<em>Referenced Expressions</em>'. + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractMultiBooleanEObjectExpressionsReferenceExpression#getReferencedExpressions() + * @see #getAbstractMultiBooleanEObjectExpressionsReferenceExpression() * @generated */ - EReference getAndExpression_OwnedExpressions(); + EReference getAbstractMultiBooleanEObjectExpressionsReferenceExpression_ReferencedExpressions(); /** - * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression#getReferencedExpressions <em>Referenced Expressions</em>}'. + * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression <em>And Expression</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Referenced Expressions</em>'. - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression#getReferencedExpressions() - * @see #getAndExpression() + * @return the meta object for class '<em>And Expression</em>'. + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression * @generated */ - EReference getAndExpression_ReferencedExpressions(); + EClass getAndExpression(); /** * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression <em>Not Expression</em>}'. @@ -742,26 +996,46 @@ public interface BooleanExpressionsPackage extends EPackage { EClass getNotExpression(); /** - * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getOwnedExpression <em>Owned Expression</em>}'. + * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionOwnedExpression <em>Abstract Single Boolean EObject Expression Owned Expression</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Abstract Single Boolean EObject Expression Owned Expression</em>'. + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionOwnedExpression + * @generated + */ + EClass getAbstractSingleBooleanEObjectExpressionOwnedExpression(); + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionOwnedExpression#getOwnedExpression <em>Owned Expression</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Owned Expression</em>'. - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getOwnedExpression() - * @see #getNotExpression() + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionOwnedExpression#getOwnedExpression() + * @see #getAbstractSingleBooleanEObjectExpressionOwnedExpression() * @generated */ - EReference getNotExpression_OwnedExpression(); + EReference getAbstractSingleBooleanEObjectExpressionOwnedExpression_OwnedExpression(); /** - * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getReferencedExpression <em>Referenced Expression</em>}'. + * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionReferenceExpression <em>Abstract Single Boolean EObject Expression Reference Expression</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Abstract Single Boolean EObject Expression Reference Expression</em>'. + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionReferenceExpression + * @generated + */ + EClass getAbstractSingleBooleanEObjectExpressionReferenceExpression(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionReferenceExpression#getReferencedExpression <em>Referenced Expression</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference '<em>Referenced Expression</em>'. - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getReferencedExpression() - * @see #getNotExpression() + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionReferenceExpression#getReferencedExpression() + * @see #getAbstractSingleBooleanEObjectExpressionReferenceExpression() * @generated */ - EReference getNotExpression_ReferencedExpression(); + EReference getAbstractSingleBooleanEObjectExpressionReferenceExpression_ReferencedExpression(); /** * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralTrueExpression <em>Literal True Expression</em>}'. @@ -794,17 +1068,6 @@ public interface BooleanExpressionsPackage extends EPackage { EClass getReferenceBooleanExpression(); /** - * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression#getReferencedExpression <em>Referenced Expression</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Referenced Expression</em>'. - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression#getReferencedExpression() - * @see #getReferenceBooleanExpression() - * @generated - */ - EReference getReferenceBooleanExpression_ReferencedExpression(); - - /** * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.SingleEAttributeValueEqualityExpression <em>Single EAttribute Value Equality Expression</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -870,20 +1133,22 @@ public interface BooleanExpressionsPackage extends EPackage { EClass OR_EXPRESSION = eINSTANCE.getOrExpression(); /** - * The meta object literal for the '<em><b>Owned Expressions</b></em>' containment reference list feature. + * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbtractMultiBooleanEObjectExpressionsOwnedExpressionImpl <em>Abtract Multi Boolean EObject Expressions Owned Expression</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbtractMultiBooleanEObjectExpressionsOwnedExpressionImpl + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getAbtractMultiBooleanEObjectExpressionsOwnedExpression() * @generated */ - EReference OR_EXPRESSION__OWNED_EXPRESSIONS = eINSTANCE.getOrExpression_OwnedExpressions(); + EClass ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION = eINSTANCE.getAbtractMultiBooleanEObjectExpressionsOwnedExpression(); /** - * The meta object literal for the '<em><b>Referenced Expressions</b></em>' reference list feature. + * The meta object literal for the '<em><b>Owned Expressions</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference OR_EXPRESSION__REFERENCED_EXPRESSIONS = eINSTANCE.getOrExpression_ReferencedExpressions(); + EReference ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS = eINSTANCE.getAbtractMultiBooleanEObjectExpressionsOwnedExpression_OwnedExpressions(); /** * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression <em>IBoolean EObject Expression</em>}' class. @@ -906,30 +1171,32 @@ public interface BooleanExpressionsPackage extends EPackage { EClass IBOOLEAN_EXPRESSION = eINSTANCE.getIBooleanExpression(); /** - * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl <em>And Expression</em>}' class. + * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractMultiBooleanEObjectExpressionsReferenceExpressionImpl <em>Abstract Multi Boolean EObject Expressions Reference Expression</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getAndExpression() + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractMultiBooleanEObjectExpressionsReferenceExpressionImpl + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getAbstractMultiBooleanEObjectExpressionsReferenceExpression() * @generated */ - EClass AND_EXPRESSION = eINSTANCE.getAndExpression(); + EClass ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION = eINSTANCE.getAbstractMultiBooleanEObjectExpressionsReferenceExpression(); /** - * The meta object literal for the '<em><b>Owned Expressions</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Referenced Expressions</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference AND_EXPRESSION__OWNED_EXPRESSIONS = eINSTANCE.getAndExpression_OwnedExpressions(); + EReference ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__REFERENCED_EXPRESSIONS = eINSTANCE.getAbstractMultiBooleanEObjectExpressionsReferenceExpression_ReferencedExpressions(); /** - * The meta object literal for the '<em><b>Referenced Expressions</b></em>' reference list feature. + * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl <em>And Expression</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getAndExpression() * @generated */ - EReference AND_EXPRESSION__REFERENCED_EXPRESSIONS = eINSTANCE.getAndExpression_ReferencedExpressions(); + EClass AND_EXPRESSION = eINSTANCE.getAndExpression(); /** * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.NotExpressionImpl <em>Not Expression</em>}' class. @@ -942,12 +1209,32 @@ public interface BooleanExpressionsPackage extends EPackage { EClass NOT_EXPRESSION = eINSTANCE.getNotExpression(); /** + * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractSingleBooleanEObjectExpressionOwnedExpressionImpl <em>Abstract Single Boolean EObject Expression Owned Expression</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractSingleBooleanEObjectExpressionOwnedExpressionImpl + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getAbstractSingleBooleanEObjectExpressionOwnedExpression() + * @generated + */ + EClass ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION = eINSTANCE.getAbstractSingleBooleanEObjectExpressionOwnedExpression(); + + /** * The meta object literal for the '<em><b>Owned Expression</b></em>' containment reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference NOT_EXPRESSION__OWNED_EXPRESSION = eINSTANCE.getNotExpression_OwnedExpression(); + EReference ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION = eINSTANCE.getAbstractSingleBooleanEObjectExpressionOwnedExpression_OwnedExpression(); + + /** + * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractSingleBooleanEObjectExpressionReferenceExpressionImpl <em>Abstract Single Boolean EObject Expression Reference Expression</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractSingleBooleanEObjectExpressionReferenceExpressionImpl + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.BooleanExpressionsPackageImpl#getAbstractSingleBooleanEObjectExpressionReferenceExpression() + * @generated + */ + EClass ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION = eINSTANCE.getAbstractSingleBooleanEObjectExpressionReferenceExpression(); /** * The meta object literal for the '<em><b>Referenced Expression</b></em>' reference feature. @@ -955,7 +1242,7 @@ public interface BooleanExpressionsPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - EReference NOT_EXPRESSION__REFERENCED_EXPRESSION = eINSTANCE.getNotExpression_ReferencedExpression(); + EReference ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__REFERENCED_EXPRESSION = eINSTANCE.getAbstractSingleBooleanEObjectExpressionReferenceExpression_ReferencedExpression(); /** * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.LiteralTrueExpressionImpl <em>Literal True Expression</em>}' class. @@ -988,14 +1275,6 @@ public interface BooleanExpressionsPackage extends EPackage { EClass REFERENCE_BOOLEAN_EXPRESSION = eINSTANCE.getReferenceBooleanExpression(); /** - * The meta object literal for the '<em><b>Referenced Expression</b></em>' reference feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION = eINSTANCE.getReferenceBooleanExpression_ReferencedExpression(); - - /** * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.SingleEAttributeValueEqualityExpressionImpl <em>Single EAttribute Value Equality Expression</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/NotExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/NotExpression.java index 0f3f03db133..838dbdb7c17 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/NotExpression.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/NotExpression.java @@ -26,69 +26,11 @@ package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions; * In other case we return the evaluation of the non NULL expression * <!-- end-model-doc --> * - * <p> - * The following features are supported: - * </p> - * <ul> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getOwnedExpression <em>Owned Expression</em>}</li> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getReferencedExpression <em>Referenced Expression</em>}</li> - * </ul> * * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getNotExpression() * @model * @generated */ -public interface NotExpression extends IBooleanEObjectExpression { - /** - * Returns the value of the '<em><b>Owned Expression</b></em>' containment reference. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Owned Expression</em>' containment reference isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Owned Expression</em>' containment reference. - * @see #setOwnedExpression(IBooleanEObjectExpression) - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getNotExpression_OwnedExpression() - * @model containment="true" ordered="false" - * @generated - */ - IBooleanEObjectExpression getOwnedExpression(); - - /** - * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getOwnedExpression <em>Owned Expression</em>}' containment reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Owned Expression</em>' containment reference. - * @see #getOwnedExpression() - * @generated - */ - void setOwnedExpression(IBooleanEObjectExpression value); - - /** - * Returns the value of the '<em><b>Referenced Expression</b></em>' reference. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Referenced Expression</em>' reference isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Referenced Expression</em>' reference. - * @see #setReferencedExpression(IBooleanEObjectExpression) - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getNotExpression_ReferencedExpression() - * @model ordered="false" - * @generated - */ - IBooleanEObjectExpression getReferencedExpression(); - - /** - * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression#getReferencedExpression <em>Referenced Expression</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Referenced Expression</em>' reference. - * @see #getReferencedExpression() - * @generated - */ - void setReferencedExpression(IBooleanEObjectExpression value); +public interface NotExpression extends AbstractSingleBooleanEObjectExpressionOwnedExpression, AbstractSingleBooleanEObjectExpressionReferenceExpression { } // NotExpression diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/OrExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/OrExpression.java index 02d730f2109..cbbc119b054 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/OrExpression.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/OrExpression.java @@ -13,8 +13,6 @@ */ package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions; -import org.eclipse.emf.common.util.EList; - /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>Or Expression</b></em>'. @@ -26,49 +24,11 @@ import org.eclipse.emf.common.util.EList; * otherwize we return the OR between all owned and referenced expressions * <!-- end-model-doc --> * - * <p> - * The following features are supported: - * </p> - * <ul> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression#getOwnedExpressions <em>Owned Expressions</em>}</li> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression#getReferencedExpressions <em>Referenced Expressions</em>}</li> - * </ul> * * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getOrExpression() * @model * @generated */ -public interface OrExpression extends IBooleanEObjectExpression { - /** - * Returns the value of the '<em><b>Owned Expressions</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Owned Expressions</em>' containment reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Owned Expressions</em>' containment reference list. - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getOrExpression_OwnedExpressions() - * @model containment="true" ordered="false" - * @generated - */ - EList<IBooleanEObjectExpression> getOwnedExpressions(); - - /** - * Returns the value of the '<em><b>Referenced Expressions</b></em>' reference list. - * The list contents are of type {@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Referenced Expressions</em>' reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Referenced Expressions</em>' reference list. - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getOrExpression_ReferencedExpressions() - * @model ordered="false" - * @generated - */ - EList<IBooleanEObjectExpression> getReferencedExpressions(); +public interface OrExpression extends AbstractMultiBooleanEObjectExpressionsReferenceExpression, AbtractMultiBooleanEObjectExpressionsOwnedExpression { } // OrExpression diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/ReferenceBooleanExpression.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/ReferenceBooleanExpression.java index 16496c5520c..6e1c5409543 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/ReferenceBooleanExpression.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/ReferenceBooleanExpression.java @@ -24,42 +24,11 @@ package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions; * If there is no expression referenced we return TRUE. * <!-- end-model-doc --> * - * <p> - * The following features are supported: - * </p> - * <ul> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression#getReferencedExpression <em>Referenced Expression</em>}</li> - * </ul> * * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getReferenceBooleanExpression() * @model * @generated */ -public interface ReferenceBooleanExpression extends IBooleanEObjectExpression { - /** - * Returns the value of the '<em><b>Referenced Expression</b></em>' reference. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Referenced Expression</em>' reference isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Referenced Expression</em>' reference. - * @see #setReferencedExpression(IBooleanEObjectExpression) - * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage#getReferenceBooleanExpression_ReferencedExpression() - * @model ordered="false" - * @generated - */ - IBooleanEObjectExpression getReferencedExpression(); - - /** - * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression#getReferencedExpression <em>Referenced Expression</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Referenced Expression</em>' reference. - * @see #getReferencedExpression() - * @generated - */ - void setReferencedExpression(IBooleanEObjectExpression value); +public interface ReferenceBooleanExpression extends AbstractSingleBooleanEObjectExpressionReferenceExpression { } // ReferenceBooleanExpression diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AbstractMultiBooleanEObjectExpressionsReferenceExpressionImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AbstractMultiBooleanEObjectExpressionsReferenceExpressionImpl.java new file mode 100755 index 00000000000..516ab90d764 --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AbstractMultiBooleanEObjectExpressionsReferenceExpressionImpl.java @@ -0,0 +1,303 @@ +/** + * Copyright (c) 2017 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + */ +package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl; + +import java.lang.reflect.InvocationTargetException; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectResolvingEList; + +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractMultiBooleanEObjectExpressionsReferenceExpression; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Abstract Multi Boolean EObject Expressions Reference Expression</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractMultiBooleanEObjectExpressionsReferenceExpressionImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractMultiBooleanEObjectExpressionsReferenceExpressionImpl#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractMultiBooleanEObjectExpressionsReferenceExpressionImpl#getReferencedExpressions <em>Referenced Expressions</em>}</li> + * </ul> + * + * @generated + */ +public abstract class AbstractMultiBooleanEObjectExpressionsReferenceExpressionImpl extends MinimalEObjectImpl.Container implements AbstractMultiBooleanEObjectExpressionsReferenceExpression { + /** + * The default value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDescription() + * @generated + * @ordered + */ + protected static final String DESCRIPTION_EDEFAULT = null; + + /** + * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDescription() + * @generated + * @ordered + */ + protected String description = DESCRIPTION_EDEFAULT; + + /** + * The cached value of the '{@link #getReferencedExpressions() <em>Referenced Expressions</em>}' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getReferencedExpressions() + * @generated + * @ordered + */ + protected EList<IBooleanEObjectExpression> referencedExpressions; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected AbstractMultiBooleanEObjectExpressionsReferenceExpressionImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return BooleanExpressionsPackage.Literals.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getName() { + return name; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setName(String newName) { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__NAME, oldName, name)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getDescription() { + return description; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setDescription(String newDescription) { + String oldDescription = description; + description = newDescription; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__DESCRIPTION, oldDescription, description)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EList<IBooleanEObjectExpression> getReferencedExpressions() { + if (referencedExpressions == null) { + referencedExpressions = new EObjectResolvingEList<IBooleanEObjectExpression>(IBooleanEObjectExpression.class, this, BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__REFERENCED_EXPRESSIONS); + } + return referencedExpressions; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Boolean evaluate(EObject context) { + // TODO: implement this method + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__NAME: + return getName(); + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__DESCRIPTION: + return getDescription(); + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__REFERENCED_EXPRESSIONS: + return getReferencedExpressions(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__NAME: + setName((String)newValue); + return; + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__DESCRIPTION: + setDescription((String)newValue); + return; + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__REFERENCED_EXPRESSIONS: + getReferencedExpressions().clear(); + getReferencedExpressions().addAll((Collection<? extends IBooleanEObjectExpression>)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__NAME: + setName(NAME_EDEFAULT); + return; + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__DESCRIPTION: + setDescription(DESCRIPTION_EDEFAULT); + return; + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__REFERENCED_EXPRESSIONS: + getReferencedExpressions().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__DESCRIPTION: + return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__REFERENCED_EXPRESSIONS: + return referencedExpressions != null && !referencedExpressions.isEmpty(); + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { + switch (operationID) { + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION___EVALUATE__OBJECT: + return evaluate((EObject)arguments.get(0)); + } + return super.eInvoke(operationID, arguments); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (name: "); //$NON-NLS-1$ + result.append(name); + result.append(", description: "); //$NON-NLS-1$ + result.append(description); + result.append(')'); + return result.toString(); + } + +} //AbstractMultiBooleanEObjectExpressionsReferenceExpressionImpl diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AbstractSingleBooleanEObjectExpressionOwnedExpressionImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AbstractSingleBooleanEObjectExpressionOwnedExpressionImpl.java new file mode 100755 index 00000000000..f476c417d8c --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AbstractSingleBooleanEObjectExpressionOwnedExpressionImpl.java @@ -0,0 +1,345 @@ +/** + * Copyright (c) 2017 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + */ +package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl; + +import java.lang.reflect.InvocationTargetException; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionOwnedExpression; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Abstract Single Boolean EObject Expression Owned Expression</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractSingleBooleanEObjectExpressionOwnedExpressionImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractSingleBooleanEObjectExpressionOwnedExpressionImpl#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractSingleBooleanEObjectExpressionOwnedExpressionImpl#getOwnedExpression <em>Owned Expression</em>}</li> + * </ul> + * + * @generated + */ +public abstract class AbstractSingleBooleanEObjectExpressionOwnedExpressionImpl extends MinimalEObjectImpl.Container implements AbstractSingleBooleanEObjectExpressionOwnedExpression { + /** + * The default value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDescription() + * @generated + * @ordered + */ + protected static final String DESCRIPTION_EDEFAULT = null; + + /** + * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDescription() + * @generated + * @ordered + */ + protected String description = DESCRIPTION_EDEFAULT; + + /** + * The cached value of the '{@link #getOwnedExpression() <em>Owned Expression</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getOwnedExpression() + * @generated + * @ordered + */ + protected IBooleanEObjectExpression ownedExpression; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected AbstractSingleBooleanEObjectExpressionOwnedExpressionImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return BooleanExpressionsPackage.Literals.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getName() { + return name; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setName(String newName) { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__NAME, oldName, name)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getDescription() { + return description; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setDescription(String newDescription) { + String oldDescription = description; + description = newDescription; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__DESCRIPTION, oldDescription, description)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public IBooleanEObjectExpression getOwnedExpression() { + return ownedExpression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetOwnedExpression(IBooleanEObjectExpression newOwnedExpression, NotificationChain msgs) { + IBooleanEObjectExpression oldOwnedExpression = ownedExpression; + ownedExpression = newOwnedExpression; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION, oldOwnedExpression, newOwnedExpression); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setOwnedExpression(IBooleanEObjectExpression newOwnedExpression) { + if (newOwnedExpression != ownedExpression) { + NotificationChain msgs = null; + if (ownedExpression != null) + msgs = ((InternalEObject)ownedExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION, null, msgs); + if (newOwnedExpression != null) + msgs = ((InternalEObject)newOwnedExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION, null, msgs); + msgs = basicSetOwnedExpression(newOwnedExpression, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION, newOwnedExpression, newOwnedExpression)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Boolean evaluate(EObject context) { + // TODO: implement this method + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION: + return basicSetOwnedExpression(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__NAME: + return getName(); + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__DESCRIPTION: + return getDescription(); + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION: + return getOwnedExpression(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__NAME: + setName((String)newValue); + return; + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__DESCRIPTION: + setDescription((String)newValue); + return; + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION: + setOwnedExpression((IBooleanEObjectExpression)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__NAME: + setName(NAME_EDEFAULT); + return; + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__DESCRIPTION: + setDescription(DESCRIPTION_EDEFAULT); + return; + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION: + setOwnedExpression((IBooleanEObjectExpression)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__DESCRIPTION: + return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION: + return ownedExpression != null; + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { + switch (operationID) { + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION___EVALUATE__OBJECT: + return evaluate((EObject)arguments.get(0)); + } + return super.eInvoke(operationID, arguments); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (name: "); //$NON-NLS-1$ + result.append(name); + result.append(", description: "); //$NON-NLS-1$ + result.append(description); + result.append(')'); + return result.toString(); + } + +} //AbstractSingleBooleanEObjectExpressionOwnedExpressionImpl diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AbstractSingleBooleanEObjectExpressionReferenceExpressionImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AbstractSingleBooleanEObjectExpressionReferenceExpressionImpl.java new file mode 100755 index 00000000000..1a557bcc7a3 --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AbstractSingleBooleanEObjectExpressionReferenceExpressionImpl.java @@ -0,0 +1,320 @@ +/** + * Copyright (c) 2017 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + */ +package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl; + +import java.lang.reflect.InvocationTargetException; +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionReferenceExpression; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Abstract Single Boolean EObject Expression Reference Expression</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractSingleBooleanEObjectExpressionReferenceExpressionImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractSingleBooleanEObjectExpressionReferenceExpressionImpl#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbstractSingleBooleanEObjectExpressionReferenceExpressionImpl#getReferencedExpression <em>Referenced Expression</em>}</li> + * </ul> + * + * @generated + */ +public abstract class AbstractSingleBooleanEObjectExpressionReferenceExpressionImpl extends MinimalEObjectImpl.Container implements AbstractSingleBooleanEObjectExpressionReferenceExpression { + /** + * The default value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + /** + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + /** + * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDescription() + * @generated + * @ordered + */ + protected static final String DESCRIPTION_EDEFAULT = null; + /** + * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDescription() + * @generated + * @ordered + */ + protected String description = DESCRIPTION_EDEFAULT; + /** + * The cached value of the '{@link #getReferencedExpression() <em>Referenced Expression</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getReferencedExpression() + * @generated + * @ordered + */ + protected IBooleanEObjectExpression referencedExpression; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected AbstractSingleBooleanEObjectExpressionReferenceExpressionImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return BooleanExpressionsPackage.Literals.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getName() { + return name; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setName(String newName) { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__NAME, oldName, name)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getDescription() { + return description; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setDescription(String newDescription) { + String oldDescription = description; + description = newDescription; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__DESCRIPTION, oldDescription, description)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public IBooleanEObjectExpression getReferencedExpression() { + if (referencedExpression != null && referencedExpression.eIsProxy()) { + InternalEObject oldReferencedExpression = (InternalEObject)referencedExpression; + referencedExpression = (IBooleanEObjectExpression)eResolveProxy(oldReferencedExpression); + if (referencedExpression != oldReferencedExpression) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__REFERENCED_EXPRESSION, oldReferencedExpression, referencedExpression)); + } + } + return referencedExpression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public IBooleanEObjectExpression basicGetReferencedExpression() { + return referencedExpression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setReferencedExpression(IBooleanEObjectExpression newReferencedExpression) { + IBooleanEObjectExpression oldReferencedExpression = referencedExpression; + referencedExpression = newReferencedExpression; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__REFERENCED_EXPRESSION, oldReferencedExpression, referencedExpression)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Boolean evaluate(EObject context) { + // TODO: implement this method + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__NAME: + return getName(); + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__DESCRIPTION: + return getDescription(); + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__REFERENCED_EXPRESSION: + if (resolve) return getReferencedExpression(); + return basicGetReferencedExpression(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__NAME: + setName((String)newValue); + return; + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__DESCRIPTION: + setDescription((String)newValue); + return; + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__REFERENCED_EXPRESSION: + setReferencedExpression((IBooleanEObjectExpression)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__NAME: + setName(NAME_EDEFAULT); + return; + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__DESCRIPTION: + setDescription(DESCRIPTION_EDEFAULT); + return; + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__REFERENCED_EXPRESSION: + setReferencedExpression((IBooleanEObjectExpression)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__DESCRIPTION: + return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__REFERENCED_EXPRESSION: + return referencedExpression != null; + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { + switch (operationID) { + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION___EVALUATE__OBJECT: + return evaluate((EObject)arguments.get(0)); + } + return super.eInvoke(operationID, arguments); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (name: "); //$NON-NLS-1$ + result.append(name); + result.append(", description: "); //$NON-NLS-1$ + result.append(description); + result.append(')'); + return result.toString(); + } + +} //AbstractSingleBooleanEObjectExpressionReferenceExpressionImpl diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AbtractMultiBooleanEObjectExpressionsOwnedExpressionImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AbtractMultiBooleanEObjectExpressionsOwnedExpressionImpl.java new file mode 100755 index 00000000000..30973b24ced --- /dev/null +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AbtractMultiBooleanEObjectExpressionsOwnedExpressionImpl.java @@ -0,0 +1,320 @@ +/** + * Copyright (c) 2017 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + */ +package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl; + +import java.lang.reflect.InvocationTargetException; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbtractMultiBooleanEObjectExpressionsOwnedExpression; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Abtract Multi Boolean EObject Expressions Owned Expression</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbtractMultiBooleanEObjectExpressionsOwnedExpressionImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbtractMultiBooleanEObjectExpressionsOwnedExpressionImpl#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AbtractMultiBooleanEObjectExpressionsOwnedExpressionImpl#getOwnedExpressions <em>Owned Expressions</em>}</li> + * </ul> + * + * @generated + */ +public abstract class AbtractMultiBooleanEObjectExpressionsOwnedExpressionImpl extends MinimalEObjectImpl.Container implements AbtractMultiBooleanEObjectExpressionsOwnedExpression { + /** + * The default value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDescription() + * @generated + * @ordered + */ + protected static final String DESCRIPTION_EDEFAULT = null; + + /** + * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDescription() + * @generated + * @ordered + */ + protected String description = DESCRIPTION_EDEFAULT; + + /** + * The cached value of the '{@link #getOwnedExpressions() <em>Owned Expressions</em>}' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getOwnedExpressions() + * @generated + * @ordered + */ + protected EList<IBooleanEObjectExpression> ownedExpressions; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected AbtractMultiBooleanEObjectExpressionsOwnedExpressionImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getName() { + return name; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setName(String newName) { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__NAME, oldName, name)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getDescription() { + return description; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setDescription(String newDescription) { + String oldDescription = description; + description = newDescription; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__DESCRIPTION, oldDescription, description)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EList<IBooleanEObjectExpression> getOwnedExpressions() { + if (ownedExpressions == null) { + ownedExpressions = new EObjectContainmentEList<IBooleanEObjectExpression>(IBooleanEObjectExpression.class, this, BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS); + } + return ownedExpressions; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Boolean evaluate(EObject context) { + // TODO: implement this method + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS: + return ((InternalEList<?>)getOwnedExpressions()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__NAME: + return getName(); + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__DESCRIPTION: + return getDescription(); + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS: + return getOwnedExpressions(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__NAME: + setName((String)newValue); + return; + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__DESCRIPTION: + setDescription((String)newValue); + return; + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS: + getOwnedExpressions().clear(); + getOwnedExpressions().addAll((Collection<? extends IBooleanEObjectExpression>)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__NAME: + setName(NAME_EDEFAULT); + return; + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__DESCRIPTION: + setDescription(DESCRIPTION_EDEFAULT); + return; + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS: + getOwnedExpressions().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__DESCRIPTION: + return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS: + return ownedExpressions != null && !ownedExpressions.isEmpty(); + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { + switch (operationID) { + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION___EVALUATE__OBJECT: + return evaluate((EObject)arguments.get(0)); + } + return super.eInvoke(operationID, arguments); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (name: "); //$NON-NLS-1$ + result.append(name); + result.append(", description: "); //$NON-NLS-1$ + result.append(description); + result.append(')'); + return result.toString(); + } + +} //AbtractMultiBooleanEObjectExpressionsOwnedExpressionImpl diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AndExpressionImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AndExpressionImpl.java index 71fc93b6992..b1ee3bede07 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AndExpressionImpl.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/AndExpressionImpl.java @@ -13,26 +13,17 @@ */ package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl; -import java.lang.reflect.InvocationTargetException; - import java.util.Collection; - -import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.EObjectResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbtractMultiBooleanEObjectExpressionsOwnedExpression; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; @@ -45,55 +36,12 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObj * The following features are implemented: * </p> * <ul> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl#getDescription <em>Description</em>}</li> * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl#getOwnedExpressions <em>Owned Expressions</em>}</li> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.AndExpressionImpl#getReferencedExpressions <em>Referenced Expressions</em>}</li> * </ul> * * @generated */ -public class AndExpressionImpl extends MinimalEObjectImpl.Container implements AndExpression { - /** - * The default value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected static final String NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected String name = NAME_EDEFAULT; - - /** - * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getDescription() - * @generated - * @ordered - */ - protected static final String DESCRIPTION_EDEFAULT = null; - - /** - * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getDescription() - * @generated - * @ordered - */ - protected String description = DESCRIPTION_EDEFAULT; - +public class AndExpressionImpl extends AbstractMultiBooleanEObjectExpressionsReferenceExpressionImpl implements AndExpression { /** * The cached value of the '{@link #getOwnedExpressions() <em>Owned Expressions</em>}' containment reference list. * <!-- begin-user-doc --> @@ -105,16 +53,6 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A protected EList<IBooleanEObjectExpression> ownedExpressions; /** - * The cached value of the '{@link #getReferencedExpressions() <em>Referenced Expressions</em>}' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getReferencedExpressions() - * @generated - * @ordered - */ - protected EList<IBooleanEObjectExpression> referencedExpressions; - - /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -139,52 +77,6 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A * @generated */ @Override - public String getName() { - return name; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setName(String newName) { - String oldName = name; - name = newName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.AND_EXPRESSION__NAME, oldName, name)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getDescription() { - return description; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setDescription(String newDescription) { - String oldDescription = description; - description = newDescription; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION, oldDescription, description)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override public EList<IBooleanEObjectExpression> getOwnedExpressions() { if (ownedExpressions == null) { ownedExpressions = new EObjectContainmentEList<IBooleanEObjectExpression>(IBooleanEObjectExpression.class, this, BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS); @@ -198,30 +90,6 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A * @generated */ @Override - public EList<IBooleanEObjectExpression> getReferencedExpressions() { - if (referencedExpressions == null) { - referencedExpressions = new EObjectResolvingEList<IBooleanEObjectExpression>(IBooleanEObjectExpression.class, this, BooleanExpressionsPackage.AND_EXPRESSION__REFERENCED_EXPRESSIONS); - } - return referencedExpressions; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Boolean evaluate(EObject context) { - // TODO: implement this method - // Ensure that you remove @generated or mark it @generated NOT - throw new UnsupportedOperationException(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS: @@ -238,14 +106,8 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case BooleanExpressionsPackage.AND_EXPRESSION__NAME: - return getName(); - case BooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION: - return getDescription(); case BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS: return getOwnedExpressions(); - case BooleanExpressionsPackage.AND_EXPRESSION__REFERENCED_EXPRESSIONS: - return getReferencedExpressions(); } return super.eGet(featureID, resolve, coreType); } @@ -259,20 +121,10 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case BooleanExpressionsPackage.AND_EXPRESSION__NAME: - setName((String)newValue); - return; - case BooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION: - setDescription((String)newValue); - return; case BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS: getOwnedExpressions().clear(); getOwnedExpressions().addAll((Collection<? extends IBooleanEObjectExpression>)newValue); return; - case BooleanExpressionsPackage.AND_EXPRESSION__REFERENCED_EXPRESSIONS: - getReferencedExpressions().clear(); - getReferencedExpressions().addAll((Collection<? extends IBooleanEObjectExpression>)newValue); - return; } super.eSet(featureID, newValue); } @@ -285,18 +137,9 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A @Override public void eUnset(int featureID) { switch (featureID) { - case BooleanExpressionsPackage.AND_EXPRESSION__NAME: - setName(NAME_EDEFAULT); - return; - case BooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION: - setDescription(DESCRIPTION_EDEFAULT); - return; case BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS: getOwnedExpressions().clear(); return; - case BooleanExpressionsPackage.AND_EXPRESSION__REFERENCED_EXPRESSIONS: - getReferencedExpressions().clear(); - return; } super.eUnset(featureID); } @@ -309,14 +152,8 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A @Override public boolean eIsSet(int featureID) { switch (featureID) { - case BooleanExpressionsPackage.AND_EXPRESSION__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case BooleanExpressionsPackage.AND_EXPRESSION__DESCRIPTION: - return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); case BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS: return ownedExpressions != null && !ownedExpressions.isEmpty(); - case BooleanExpressionsPackage.AND_EXPRESSION__REFERENCED_EXPRESSIONS: - return referencedExpressions != null && !referencedExpressions.isEmpty(); } return super.eIsSet(featureID); } @@ -327,12 +164,14 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A * @generated */ @Override - public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { - switch (operationID) { - case BooleanExpressionsPackage.AND_EXPRESSION___EVALUATE__OBJECT: - return evaluate((EObject)arguments.get(0)); + public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { + if (baseClass == AbtractMultiBooleanEObjectExpressionsOwnedExpression.class) { + switch (derivedFeatureID) { + case BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS: return BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS; + default: return -1; + } } - return super.eInvoke(operationID, arguments); + return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); } /** @@ -341,16 +180,14 @@ public class AndExpressionImpl extends MinimalEObjectImpl.Container implements A * @generated */ @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuilder result = new StringBuilder(super.toString()); - result.append(" (name: "); //$NON-NLS-1$ - result.append(name); - result.append(", description: "); //$NON-NLS-1$ - result.append(description); - result.append(')'); - return result.toString(); + public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { + if (baseClass == AbtractMultiBooleanEObjectExpressionsOwnedExpression.class) { + switch (baseFeatureID) { + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS: return BooleanExpressionsPackage.AND_EXPRESSION__OWNED_EXPRESSIONS; + default: return -1; + } + } + return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } } //AndExpressionImpl diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/BooleanExpressionsPackageImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/BooleanExpressionsPackageImpl.java index f19a1d1a67e..7fc7edb9cf2 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/BooleanExpressionsPackageImpl.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/BooleanExpressionsPackageImpl.java @@ -25,6 +25,10 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractMultiBooleanEObjectExpressionsReferenceExpression; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionOwnedExpression; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionReferenceExpression; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbtractMultiBooleanEObjectExpressionsOwnedExpression; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsFactory; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; @@ -58,6 +62,13 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole * <!-- end-user-doc --> * @generated */ + private EClass abtractMultiBooleanEObjectExpressionsOwnedExpressionEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EClass iBooleanEObjectExpressionEClass = null; /** @@ -72,6 +83,13 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole * <!-- end-user-doc --> * @generated */ + private EClass abstractMultiBooleanEObjectExpressionsReferenceExpressionEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EClass andExpressionEClass = null; /** @@ -86,6 +104,20 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole * <!-- end-user-doc --> * @generated */ + private EClass abstractSingleBooleanEObjectExpressionOwnedExpressionEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass abstractSingleBooleanEObjectExpressionReferenceExpressionEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EClass literalTrueExpressionEClass = null; /** @@ -195,8 +227,8 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole * @generated */ @Override - public EReference getOrExpression_OwnedExpressions() { - return (EReference)orExpressionEClass.getEStructuralFeatures().get(0); + public EClass getAbtractMultiBooleanEObjectExpressionsOwnedExpression() { + return abtractMultiBooleanEObjectExpressionsOwnedExpressionEClass; } /** @@ -205,8 +237,8 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole * @generated */ @Override - public EReference getOrExpression_ReferencedExpressions() { - return (EReference)orExpressionEClass.getEStructuralFeatures().get(1); + public EReference getAbtractMultiBooleanEObjectExpressionsOwnedExpression_OwnedExpressions() { + return (EReference)abtractMultiBooleanEObjectExpressionsOwnedExpressionEClass.getEStructuralFeatures().get(0); } /** @@ -235,8 +267,8 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole * @generated */ @Override - public EClass getAndExpression() { - return andExpressionEClass; + public EClass getAbstractMultiBooleanEObjectExpressionsReferenceExpression() { + return abstractMultiBooleanEObjectExpressionsReferenceExpressionEClass; } /** @@ -245,8 +277,8 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole * @generated */ @Override - public EReference getAndExpression_OwnedExpressions() { - return (EReference)andExpressionEClass.getEStructuralFeatures().get(0); + public EReference getAbstractMultiBooleanEObjectExpressionsReferenceExpression_ReferencedExpressions() { + return (EReference)abstractMultiBooleanEObjectExpressionsReferenceExpressionEClass.getEStructuralFeatures().get(0); } /** @@ -255,8 +287,8 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole * @generated */ @Override - public EReference getAndExpression_ReferencedExpressions() { - return (EReference)andExpressionEClass.getEStructuralFeatures().get(1); + public EClass getAndExpression() { + return andExpressionEClass; } /** @@ -275,8 +307,8 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole * @generated */ @Override - public EReference getNotExpression_OwnedExpression() { - return (EReference)notExpressionEClass.getEStructuralFeatures().get(0); + public EClass getAbstractSingleBooleanEObjectExpressionOwnedExpression() { + return abstractSingleBooleanEObjectExpressionOwnedExpressionEClass; } /** @@ -285,8 +317,8 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole * @generated */ @Override - public EReference getNotExpression_ReferencedExpression() { - return (EReference)notExpressionEClass.getEStructuralFeatures().get(1); + public EReference getAbstractSingleBooleanEObjectExpressionOwnedExpression_OwnedExpression() { + return (EReference)abstractSingleBooleanEObjectExpressionOwnedExpressionEClass.getEStructuralFeatures().get(0); } /** @@ -295,8 +327,8 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole * @generated */ @Override - public EClass getLiteralTrueExpression() { - return literalTrueExpressionEClass; + public EClass getAbstractSingleBooleanEObjectExpressionReferenceExpression() { + return abstractSingleBooleanEObjectExpressionReferenceExpressionEClass; } /** @@ -305,8 +337,8 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole * @generated */ @Override - public EClass getLiteralFalseExpression() { - return literalFalseExpressionEClass; + public EReference getAbstractSingleBooleanEObjectExpressionReferenceExpression_ReferencedExpression() { + return (EReference)abstractSingleBooleanEObjectExpressionReferenceExpressionEClass.getEStructuralFeatures().get(0); } /** @@ -315,8 +347,18 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole * @generated */ @Override - public EClass getReferenceBooleanExpression() { - return referenceBooleanExpressionEClass; + public EClass getLiteralTrueExpression() { + return literalTrueExpressionEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EClass getLiteralFalseExpression() { + return literalFalseExpressionEClass; } /** @@ -325,8 +367,8 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole * @generated */ @Override - public EReference getReferenceBooleanExpression_ReferencedExpression() { - return (EReference)referenceBooleanExpressionEClass.getEStructuralFeatures().get(0); + public EClass getReferenceBooleanExpression() { + return referenceBooleanExpressionEClass; } /** @@ -389,27 +431,32 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole // Create classes and their features orExpressionEClass = createEClass(OR_EXPRESSION); - createEReference(orExpressionEClass, OR_EXPRESSION__OWNED_EXPRESSIONS); - createEReference(orExpressionEClass, OR_EXPRESSION__REFERENCED_EXPRESSIONS); + + abtractMultiBooleanEObjectExpressionsOwnedExpressionEClass = createEClass(ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION); + createEReference(abtractMultiBooleanEObjectExpressionsOwnedExpressionEClass, ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS); iBooleanEObjectExpressionEClass = createEClass(IBOOLEAN_EOBJECT_EXPRESSION); iBooleanExpressionEClass = createEClass(IBOOLEAN_EXPRESSION); + abstractMultiBooleanEObjectExpressionsReferenceExpressionEClass = createEClass(ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION); + createEReference(abstractMultiBooleanEObjectExpressionsReferenceExpressionEClass, ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION__REFERENCED_EXPRESSIONS); + andExpressionEClass = createEClass(AND_EXPRESSION); - createEReference(andExpressionEClass, AND_EXPRESSION__OWNED_EXPRESSIONS); - createEReference(andExpressionEClass, AND_EXPRESSION__REFERENCED_EXPRESSIONS); notExpressionEClass = createEClass(NOT_EXPRESSION); - createEReference(notExpressionEClass, NOT_EXPRESSION__OWNED_EXPRESSION); - createEReference(notExpressionEClass, NOT_EXPRESSION__REFERENCED_EXPRESSION); + + abstractSingleBooleanEObjectExpressionOwnedExpressionEClass = createEClass(ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION); + createEReference(abstractSingleBooleanEObjectExpressionOwnedExpressionEClass, ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION); + + abstractSingleBooleanEObjectExpressionReferenceExpressionEClass = createEClass(ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION); + createEReference(abstractSingleBooleanEObjectExpressionReferenceExpressionEClass, ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__REFERENCED_EXPRESSION); literalTrueExpressionEClass = createEClass(LITERAL_TRUE_EXPRESSION); literalFalseExpressionEClass = createEClass(LITERAL_FALSE_EXPRESSION); referenceBooleanExpressionEClass = createEClass(REFERENCE_BOOLEAN_EXPRESSION); - createEReference(referenceBooleanExpressionEClass, REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION); singleEAttributeValueEqualityExpressionEClass = createEClass(SINGLE_EATTRIBUTE_VALUE_EQUALITY_EXPRESSION); createEReference(singleEAttributeValueEqualityExpressionEClass, SINGLE_EATTRIBUTE_VALUE_EQUALITY_EXPRESSION__EATTRIBUTE); @@ -449,7 +496,9 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole // Set bounds for type parameters // Add supertypes to classes - orExpressionEClass.getESuperTypes().add(this.getIBooleanEObjectExpression()); + orExpressionEClass.getESuperTypes().add(this.getAbstractMultiBooleanEObjectExpressionsReferenceExpression()); + orExpressionEClass.getESuperTypes().add(this.getAbtractMultiBooleanEObjectExpressionsOwnedExpression()); + abtractMultiBooleanEObjectExpressionsOwnedExpressionEClass.getESuperTypes().add(this.getIBooleanEObjectExpression()); EGenericType g1 = createEGenericType(this.getIBooleanExpression()); EGenericType g2 = createEGenericType(theEcorePackage.getEObject()); g1.getETypeArguments().add(g2); @@ -460,36 +509,46 @@ public class BooleanExpressionsPackageImpl extends EPackageImpl implements Boole g2 = createEGenericType(ecorePackage.getEBooleanObject()); g1.getETypeArguments().add(g2); iBooleanExpressionEClass.getEGenericSuperTypes().add(g1); - andExpressionEClass.getESuperTypes().add(this.getIBooleanEObjectExpression()); - notExpressionEClass.getESuperTypes().add(this.getIBooleanEObjectExpression()); + abstractMultiBooleanEObjectExpressionsReferenceExpressionEClass.getESuperTypes().add(this.getIBooleanEObjectExpression()); + andExpressionEClass.getESuperTypes().add(this.getAbstractMultiBooleanEObjectExpressionsReferenceExpression()); + andExpressionEClass.getESuperTypes().add(this.getAbtractMultiBooleanEObjectExpressionsOwnedExpression()); + notExpressionEClass.getESuperTypes().add(this.getAbstractSingleBooleanEObjectExpressionOwnedExpression()); + notExpressionEClass.getESuperTypes().add(this.getAbstractSingleBooleanEObjectExpressionReferenceExpression()); + abstractSingleBooleanEObjectExpressionOwnedExpressionEClass.getESuperTypes().add(this.getIBooleanEObjectExpression()); + abstractSingleBooleanEObjectExpressionReferenceExpressionEClass.getESuperTypes().add(this.getIBooleanEObjectExpression()); literalTrueExpressionEClass.getESuperTypes().add(this.getIBooleanEObjectExpression()); literalFalseExpressionEClass.getESuperTypes().add(this.getIBooleanEObjectExpression()); - referenceBooleanExpressionEClass.getESuperTypes().add(this.getIBooleanEObjectExpression()); + referenceBooleanExpressionEClass.getESuperTypes().add(this.getAbstractSingleBooleanEObjectExpressionReferenceExpression()); singleEAttributeValueEqualityExpressionEClass.getESuperTypes().add(this.getIBooleanEObjectExpression()); // Initialize classes, features, and operations; add parameters initEClass(orExpressionEClass, OrExpression.class, "OrExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getOrExpression_OwnedExpressions(), this.getIBooleanEObjectExpression(), null, "ownedExpressions", null, 0, -1, OrExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getOrExpression_ReferencedExpressions(), this.getIBooleanEObjectExpression(), null, "referencedExpressions", null, 0, -1, OrExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + + initEClass(abtractMultiBooleanEObjectExpressionsOwnedExpressionEClass, AbtractMultiBooleanEObjectExpressionsOwnedExpression.class, "AbtractMultiBooleanEObjectExpressionsOwnedExpression", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getAbtractMultiBooleanEObjectExpressionsOwnedExpression_OwnedExpressions(), this.getIBooleanEObjectExpression(), null, "ownedExpressions", null, 0, -1, AbtractMultiBooleanEObjectExpressionsOwnedExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ initEClass(iBooleanEObjectExpressionEClass, IBooleanEObjectExpression.class, "IBooleanEObjectExpression", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEClass(iBooleanExpressionEClass, IBooleanExpression.class, "IBooleanExpression", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEClass(abstractMultiBooleanEObjectExpressionsReferenceExpressionEClass, AbstractMultiBooleanEObjectExpressionsReferenceExpression.class, "AbstractMultiBooleanEObjectExpressionsReferenceExpression", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getAbstractMultiBooleanEObjectExpressionsReferenceExpression_ReferencedExpressions(), this.getIBooleanEObjectExpression(), null, "referencedExpressions", null, 0, -1, AbstractMultiBooleanEObjectExpressionsReferenceExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + initEClass(andExpressionEClass, AndExpression.class, "AndExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getAndExpression_OwnedExpressions(), this.getIBooleanEObjectExpression(), null, "ownedExpressions", null, 0, -1, AndExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getAndExpression_ReferencedExpressions(), this.getIBooleanEObjectExpression(), null, "referencedExpressions", null, 0, -1, AndExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ initEClass(notExpressionEClass, NotExpression.class, "NotExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getNotExpression_OwnedExpression(), this.getIBooleanEObjectExpression(), null, "ownedExpression", null, 0, 1, NotExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getNotExpression_ReferencedExpression(), this.getIBooleanEObjectExpression(), null, "referencedExpression", null, 0, 1, NotExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + + initEClass(abstractSingleBooleanEObjectExpressionOwnedExpressionEClass, AbstractSingleBooleanEObjectExpressionOwnedExpression.class, "AbstractSingleBooleanEObjectExpressionOwnedExpression", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getAbstractSingleBooleanEObjectExpressionOwnedExpression_OwnedExpression(), this.getIBooleanEObjectExpression(), null, "ownedExpression", null, 0, 1, AbstractSingleBooleanEObjectExpressionOwnedExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + + initEClass(abstractSingleBooleanEObjectExpressionReferenceExpressionEClass, AbstractSingleBooleanEObjectExpressionReferenceExpression.class, "AbstractSingleBooleanEObjectExpressionReferenceExpression", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getAbstractSingleBooleanEObjectExpressionReferenceExpression_ReferencedExpression(), this.getIBooleanEObjectExpression(), null, "referencedExpression", null, 0, 1, AbstractSingleBooleanEObjectExpressionReferenceExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ initEClass(literalTrueExpressionEClass, LiteralTrueExpression.class, "LiteralTrueExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEClass(literalFalseExpressionEClass, LiteralFalseExpression.class, "LiteralFalseExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEClass(referenceBooleanExpressionEClass, ReferenceBooleanExpression.class, "ReferenceBooleanExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getReferenceBooleanExpression_ReferencedExpression(), this.getIBooleanEObjectExpression(), null, "referencedExpression", null, 0, 1, ReferenceBooleanExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ initEClass(singleEAttributeValueEqualityExpressionEClass, SingleEAttributeValueEqualityExpression.class, "SingleEAttributeValueEqualityExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEReference(getSingleEAttributeValueEqualityExpression_EAttribute(), theEcorePackage.getEAttribute(), null, "eAttribute", null, 0, 1, SingleEAttributeValueEqualityExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/NotExpressionImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/NotExpressionImpl.java index b354fc7f2d3..e66ebd3f011 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/NotExpressionImpl.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/NotExpressionImpl.java @@ -13,20 +13,12 @@ */ package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl; -import java.lang.reflect.InvocationTargetException; - import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionReferenceExpression; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpression; @@ -39,65 +31,12 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.NotExpressio * The following features are implemented: * </p> * <ul> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.NotExpressionImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.NotExpressionImpl#getDescription <em>Description</em>}</li> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.NotExpressionImpl#getOwnedExpression <em>Owned Expression</em>}</li> * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.NotExpressionImpl#getReferencedExpression <em>Referenced Expression</em>}</li> * </ul> * * @generated */ -public class NotExpressionImpl extends MinimalEObjectImpl.Container implements NotExpression { - /** - * The default value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected static final String NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected String name = NAME_EDEFAULT; - - /** - * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getDescription() - * @generated - * @ordered - */ - protected static final String DESCRIPTION_EDEFAULT = null; - - /** - * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getDescription() - * @generated - * @ordered - */ - protected String description = DESCRIPTION_EDEFAULT; - - /** - * The cached value of the '{@link #getOwnedExpression() <em>Owned Expression</em>}' containment reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getOwnedExpression() - * @generated - * @ordered - */ - protected IBooleanEObjectExpression ownedExpression; - +public class NotExpressionImpl extends AbstractSingleBooleanEObjectExpressionOwnedExpressionImpl implements NotExpression { /** * The cached value of the '{@link #getReferencedExpression() <em>Referenced Expression</em>}' reference. * <!-- begin-user-doc --> @@ -133,97 +72,6 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N * @generated */ @Override - public String getName() { - return name; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setName(String newName) { - String oldName = name; - name = newName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.NOT_EXPRESSION__NAME, oldName, name)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getDescription() { - return description; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setDescription(String newDescription) { - String oldDescription = description; - description = newDescription; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION, oldDescription, description)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public IBooleanEObjectExpression getOwnedExpression() { - return ownedExpression; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public NotificationChain basicSetOwnedExpression(IBooleanEObjectExpression newOwnedExpression, NotificationChain msgs) { - IBooleanEObjectExpression oldOwnedExpression = ownedExpression; - ownedExpression = newOwnedExpression; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION, oldOwnedExpression, newOwnedExpression); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setOwnedExpression(IBooleanEObjectExpression newOwnedExpression) { - if (newOwnedExpression != ownedExpression) { - NotificationChain msgs = null; - if (ownedExpression != null) - msgs = ((InternalEObject)ownedExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION, null, msgs); - if (newOwnedExpression != null) - msgs = ((InternalEObject)newOwnedExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION, null, msgs); - msgs = basicSetOwnedExpression(newOwnedExpression, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION, newOwnedExpression, newOwnedExpression)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override public IBooleanEObjectExpression getReferencedExpression() { if (referencedExpression != null && referencedExpression.eIsProxy()) { InternalEObject oldReferencedExpression = (InternalEObject)referencedExpression; @@ -263,40 +111,9 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ - public Boolean evaluate(EObject context) { - // TODO: implement this method - // Ensure that you remove @generated or mark it @generated NOT - throw new UnsupportedOperationException(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION: - return basicSetOwnedExpression(null, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case BooleanExpressionsPackage.NOT_EXPRESSION__NAME: - return getName(); - case BooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION: - return getDescription(); - case BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION: - return getOwnedExpression(); case BooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION: if (resolve) return getReferencedExpression(); return basicGetReferencedExpression(); @@ -312,15 +129,6 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case BooleanExpressionsPackage.NOT_EXPRESSION__NAME: - setName((String)newValue); - return; - case BooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION: - setDescription((String)newValue); - return; - case BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION: - setOwnedExpression((IBooleanEObjectExpression)newValue); - return; case BooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION: setReferencedExpression((IBooleanEObjectExpression)newValue); return; @@ -336,15 +144,6 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N @Override public void eUnset(int featureID) { switch (featureID) { - case BooleanExpressionsPackage.NOT_EXPRESSION__NAME: - setName(NAME_EDEFAULT); - return; - case BooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION: - setDescription(DESCRIPTION_EDEFAULT); - return; - case BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION: - setOwnedExpression((IBooleanEObjectExpression)null); - return; case BooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION: setReferencedExpression((IBooleanEObjectExpression)null); return; @@ -360,12 +159,6 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N @Override public boolean eIsSet(int featureID) { switch (featureID) { - case BooleanExpressionsPackage.NOT_EXPRESSION__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case BooleanExpressionsPackage.NOT_EXPRESSION__DESCRIPTION: - return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); - case BooleanExpressionsPackage.NOT_EXPRESSION__OWNED_EXPRESSION: - return ownedExpression != null; case BooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION: return referencedExpression != null; } @@ -378,12 +171,14 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N * @generated */ @Override - public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { - switch (operationID) { - case BooleanExpressionsPackage.NOT_EXPRESSION___EVALUATE__OBJECT: - return evaluate((EObject)arguments.get(0)); + public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { + if (baseClass == AbstractSingleBooleanEObjectExpressionReferenceExpression.class) { + switch (derivedFeatureID) { + case BooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION: return BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__REFERENCED_EXPRESSION; + default: return -1; + } } - return super.eInvoke(operationID, arguments); + return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); } /** @@ -392,16 +187,14 @@ public class NotExpressionImpl extends MinimalEObjectImpl.Container implements N * @generated */ @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuilder result = new StringBuilder(super.toString()); - result.append(" (name: "); //$NON-NLS-1$ - result.append(name); - result.append(", description: "); //$NON-NLS-1$ - result.append(description); - result.append(')'); - return result.toString(); + public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { + if (baseClass == AbstractSingleBooleanEObjectExpressionReferenceExpression.class) { + switch (baseFeatureID) { + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION__REFERENCED_EXPRESSION: return BooleanExpressionsPackage.NOT_EXPRESSION__REFERENCED_EXPRESSION; + default: return -1; + } + } + return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } } //NotExpressionImpl diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/OrExpressionImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/OrExpressionImpl.java index def0887a1b1..46a20888274 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/OrExpressionImpl.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/OrExpressionImpl.java @@ -13,26 +13,17 @@ */ package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl; -import java.lang.reflect.InvocationTargetException; - import java.util.Collection; - -import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.EObjectResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbtractMultiBooleanEObjectExpressionsOwnedExpression; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression; @@ -45,55 +36,12 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.OrExpression * The following features are implemented: * </p> * <ul> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.OrExpressionImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.OrExpressionImpl#getDescription <em>Description</em>}</li> * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.OrExpressionImpl#getOwnedExpressions <em>Owned Expressions</em>}</li> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.OrExpressionImpl#getReferencedExpressions <em>Referenced Expressions</em>}</li> * </ul> * * @generated */ -public class OrExpressionImpl extends MinimalEObjectImpl.Container implements OrExpression { - /** - * The default value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected static final String NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected String name = NAME_EDEFAULT; - - /** - * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getDescription() - * @generated - * @ordered - */ - protected static final String DESCRIPTION_EDEFAULT = null; - - /** - * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getDescription() - * @generated - * @ordered - */ - protected String description = DESCRIPTION_EDEFAULT; - +public class OrExpressionImpl extends AbstractMultiBooleanEObjectExpressionsReferenceExpressionImpl implements OrExpression { /** * The cached value of the '{@link #getOwnedExpressions() <em>Owned Expressions</em>}' containment reference list. * <!-- begin-user-doc --> @@ -105,16 +53,6 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or protected EList<IBooleanEObjectExpression> ownedExpressions; /** - * The cached value of the '{@link #getReferencedExpressions() <em>Referenced Expressions</em>}' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getReferencedExpressions() - * @generated - * @ordered - */ - protected EList<IBooleanEObjectExpression> referencedExpressions; - - /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -139,52 +77,6 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or * @generated */ @Override - public String getName() { - return name; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setName(String newName) { - String oldName = name; - name = newName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.OR_EXPRESSION__NAME, oldName, name)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getDescription() { - return description; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setDescription(String newDescription) { - String oldDescription = description; - description = newDescription; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION, oldDescription, description)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override public EList<IBooleanEObjectExpression> getOwnedExpressions() { if (ownedExpressions == null) { ownedExpressions = new EObjectContainmentEList<IBooleanEObjectExpression>(IBooleanEObjectExpression.class, this, BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS); @@ -198,30 +90,6 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or * @generated */ @Override - public EList<IBooleanEObjectExpression> getReferencedExpressions() { - if (referencedExpressions == null) { - referencedExpressions = new EObjectResolvingEList<IBooleanEObjectExpression>(IBooleanEObjectExpression.class, this, BooleanExpressionsPackage.OR_EXPRESSION__REFERENCED_EXPRESSIONS); - } - return referencedExpressions; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Boolean evaluate(EObject context) { - // TODO: implement this method - // Ensure that you remove @generated or mark it @generated NOT - throw new UnsupportedOperationException(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS: @@ -238,14 +106,8 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case BooleanExpressionsPackage.OR_EXPRESSION__NAME: - return getName(); - case BooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION: - return getDescription(); case BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS: return getOwnedExpressions(); - case BooleanExpressionsPackage.OR_EXPRESSION__REFERENCED_EXPRESSIONS: - return getReferencedExpressions(); } return super.eGet(featureID, resolve, coreType); } @@ -259,20 +121,10 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case BooleanExpressionsPackage.OR_EXPRESSION__NAME: - setName((String)newValue); - return; - case BooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION: - setDescription((String)newValue); - return; case BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS: getOwnedExpressions().clear(); getOwnedExpressions().addAll((Collection<? extends IBooleanEObjectExpression>)newValue); return; - case BooleanExpressionsPackage.OR_EXPRESSION__REFERENCED_EXPRESSIONS: - getReferencedExpressions().clear(); - getReferencedExpressions().addAll((Collection<? extends IBooleanEObjectExpression>)newValue); - return; } super.eSet(featureID, newValue); } @@ -285,18 +137,9 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or @Override public void eUnset(int featureID) { switch (featureID) { - case BooleanExpressionsPackage.OR_EXPRESSION__NAME: - setName(NAME_EDEFAULT); - return; - case BooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION: - setDescription(DESCRIPTION_EDEFAULT); - return; case BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS: getOwnedExpressions().clear(); return; - case BooleanExpressionsPackage.OR_EXPRESSION__REFERENCED_EXPRESSIONS: - getReferencedExpressions().clear(); - return; } super.eUnset(featureID); } @@ -309,14 +152,8 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or @Override public boolean eIsSet(int featureID) { switch (featureID) { - case BooleanExpressionsPackage.OR_EXPRESSION__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case BooleanExpressionsPackage.OR_EXPRESSION__DESCRIPTION: - return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); case BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS: return ownedExpressions != null && !ownedExpressions.isEmpty(); - case BooleanExpressionsPackage.OR_EXPRESSION__REFERENCED_EXPRESSIONS: - return referencedExpressions != null && !referencedExpressions.isEmpty(); } return super.eIsSet(featureID); } @@ -327,12 +164,14 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or * @generated */ @Override - public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { - switch (operationID) { - case BooleanExpressionsPackage.OR_EXPRESSION___EVALUATE__OBJECT: - return evaluate((EObject)arguments.get(0)); + public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { + if (baseClass == AbtractMultiBooleanEObjectExpressionsOwnedExpression.class) { + switch (derivedFeatureID) { + case BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS: return BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS; + default: return -1; + } } - return super.eInvoke(operationID, arguments); + return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); } /** @@ -341,16 +180,14 @@ public class OrExpressionImpl extends MinimalEObjectImpl.Container implements Or * @generated */ @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuilder result = new StringBuilder(super.toString()); - result.append(" (name: "); //$NON-NLS-1$ - result.append(name); - result.append(", description: "); //$NON-NLS-1$ - result.append(description); - result.append(')'); - return result.toString(); + public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { + if (baseClass == AbtractMultiBooleanEObjectExpressionsOwnedExpression.class) { + switch (baseFeatureID) { + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS: return BooleanExpressionsPackage.OR_EXPRESSION__OWNED_EXPRESSIONS; + default: return -1; + } + } + return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } } //OrExpressionImpl diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/ReferenceBooleanExpressionImpl.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/ReferenceBooleanExpressionImpl.java index e110ca59978..afec14ca37e 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/ReferenceBooleanExpressionImpl.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/impl/ReferenceBooleanExpressionImpl.java @@ -13,89 +13,18 @@ */ package org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl; -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; -import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.ReferenceBooleanExpression; /** * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Reference Boolean Expression</b></em>'. * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * </p> - * <ul> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.ReferenceBooleanExpressionImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.ReferenceBooleanExpressionImpl#getDescription <em>Description</em>}</li> - * <li>{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.impl.ReferenceBooleanExpressionImpl#getReferencedExpression <em>Referenced Expression</em>}</li> - * </ul> * * @generated */ -public class ReferenceBooleanExpressionImpl extends MinimalEObjectImpl.Container implements ReferenceBooleanExpression { - /** - * The default value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected static final String NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected String name = NAME_EDEFAULT; - - /** - * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getDescription() - * @generated - * @ordered - */ - protected static final String DESCRIPTION_EDEFAULT = null; - - /** - * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getDescription() - * @generated - * @ordered - */ - protected String description = DESCRIPTION_EDEFAULT; - - /** - * The cached value of the '{@link #getReferencedExpression() <em>Referenced Expression</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getReferencedExpression() - * @generated - * @ordered - */ - protected IBooleanEObjectExpression referencedExpression; - +public class ReferenceBooleanExpressionImpl extends AbstractSingleBooleanEObjectExpressionReferenceExpressionImpl implements ReferenceBooleanExpression { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -115,212 +44,4 @@ public class ReferenceBooleanExpressionImpl extends MinimalEObjectImpl.Container return BooleanExpressionsPackage.Literals.REFERENCE_BOOLEAN_EXPRESSION; } - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getName() { - return name; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setName(String newName) { - String oldName = name; - name = newName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME, oldName, name)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getDescription() { - return description; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setDescription(String newDescription) { - String oldDescription = description; - description = newDescription; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION, oldDescription, description)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public IBooleanEObjectExpression getReferencedExpression() { - if (referencedExpression != null && referencedExpression.eIsProxy()) { - InternalEObject oldReferencedExpression = (InternalEObject)referencedExpression; - referencedExpression = (IBooleanEObjectExpression)eResolveProxy(oldReferencedExpression); - if (referencedExpression != oldReferencedExpression) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION, oldReferencedExpression, referencedExpression)); - } - } - return referencedExpression; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public IBooleanEObjectExpression basicGetReferencedExpression() { - return referencedExpression; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setReferencedExpression(IBooleanEObjectExpression newReferencedExpression) { - IBooleanEObjectExpression oldReferencedExpression = referencedExpression; - referencedExpression = newReferencedExpression; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION, oldReferencedExpression, referencedExpression)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Boolean evaluate(EObject context) { - // TODO: implement this method - // Ensure that you remove @generated or mark it @generated NOT - throw new UnsupportedOperationException(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME: - return getName(); - case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION: - return getDescription(); - case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION: - if (resolve) return getReferencedExpression(); - return basicGetReferencedExpression(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME: - setName((String)newValue); - return; - case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION: - setDescription((String)newValue); - return; - case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION: - setReferencedExpression((IBooleanEObjectExpression)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME: - setName(NAME_EDEFAULT); - return; - case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION: - setDescription(DESCRIPTION_EDEFAULT); - return; - case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION: - setReferencedExpression((IBooleanEObjectExpression)null); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__DESCRIPTION: - return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); - case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION__REFERENCED_EXPRESSION: - return referencedExpression != null; - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { - switch (operationID) { - case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION___EVALUATE__OBJECT: - return evaluate((EObject)arguments.get(0)); - } - return super.eInvoke(operationID, arguments); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuilder result = new StringBuilder(super.toString()); - result.append(" (name: "); //$NON-NLS-1$ - result.append(name); - result.append(", description: "); //$NON-NLS-1$ - result.append(description); - result.append(')'); - return result.toString(); - } - } //ReferenceBooleanExpressionImpl diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/util/BooleanExpressionsAdapterFactory.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/util/BooleanExpressionsAdapterFactory.java index 0faf645a86b..5af228350de 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/util/BooleanExpressionsAdapterFactory.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/util/BooleanExpressionsAdapterFactory.java @@ -86,6 +86,10 @@ public class BooleanExpressionsAdapterFactory extends AdapterFactoryImpl { return createOrExpressionAdapter(); } @Override + public Adapter caseAbtractMultiBooleanEObjectExpressionsOwnedExpression(AbtractMultiBooleanEObjectExpressionsOwnedExpression object) { + return createAbtractMultiBooleanEObjectExpressionsOwnedExpressionAdapter(); + } + @Override public Adapter caseIBooleanEObjectExpression(IBooleanEObjectExpression object) { return createIBooleanEObjectExpressionAdapter(); } @@ -94,6 +98,10 @@ public class BooleanExpressionsAdapterFactory extends AdapterFactoryImpl { return createIBooleanExpressionAdapter(); } @Override + public Adapter caseAbstractMultiBooleanEObjectExpressionsReferenceExpression(AbstractMultiBooleanEObjectExpressionsReferenceExpression object) { + return createAbstractMultiBooleanEObjectExpressionsReferenceExpressionAdapter(); + } + @Override public Adapter caseAndExpression(AndExpression object) { return createAndExpressionAdapter(); } @@ -102,6 +110,14 @@ public class BooleanExpressionsAdapterFactory extends AdapterFactoryImpl { return createNotExpressionAdapter(); } @Override + public Adapter caseAbstractSingleBooleanEObjectExpressionOwnedExpression(AbstractSingleBooleanEObjectExpressionOwnedExpression object) { + return createAbstractSingleBooleanEObjectExpressionOwnedExpressionAdapter(); + } + @Override + public Adapter caseAbstractSingleBooleanEObjectExpressionReferenceExpression(AbstractSingleBooleanEObjectExpressionReferenceExpression object) { + return createAbstractSingleBooleanEObjectExpressionReferenceExpressionAdapter(); + } + @Override public Adapter caseLiteralTrueExpression(LiteralTrueExpression object) { return createLiteralTrueExpressionAdapter(); } @@ -160,6 +176,20 @@ public class BooleanExpressionsAdapterFactory extends AdapterFactoryImpl { } /** + * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbtractMultiBooleanEObjectExpressionsOwnedExpression <em>Abtract Multi Boolean EObject Expressions Owned Expression</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbtractMultiBooleanEObjectExpressionsOwnedExpression + * @generated + */ + public Adapter createAbtractMultiBooleanEObjectExpressionsOwnedExpressionAdapter() { + return null; + } + + /** * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression <em>IBoolean EObject Expression</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; @@ -188,6 +218,20 @@ public class BooleanExpressionsAdapterFactory extends AdapterFactoryImpl { } /** + * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractMultiBooleanEObjectExpressionsReferenceExpression <em>Abstract Multi Boolean EObject Expressions Reference Expression</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractMultiBooleanEObjectExpressionsReferenceExpression + * @generated + */ + public Adapter createAbstractMultiBooleanEObjectExpressionsReferenceExpressionAdapter() { + return null; + } + + /** * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AndExpression <em>And Expression</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; @@ -216,6 +260,34 @@ public class BooleanExpressionsAdapterFactory extends AdapterFactoryImpl { } /** + * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionOwnedExpression <em>Abstract Single Boolean EObject Expression Owned Expression</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionOwnedExpression + * @generated + */ + public Adapter createAbstractSingleBooleanEObjectExpressionOwnedExpressionAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionReferenceExpression <em>Abstract Single Boolean EObject Expression Reference Expression</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.AbstractSingleBooleanEObjectExpressionReferenceExpression + * @generated + */ + public Adapter createAbstractSingleBooleanEObjectExpressionReferenceExpressionAdapter() { + return null; + } + + /** * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.LiteralTrueExpression <em>Literal True Expression</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/util/BooleanExpressionsSwitch.java b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/util/BooleanExpressionsSwitch.java index b104b491a76..7b91c9841ef 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/util/BooleanExpressionsSwitch.java +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/src-gen/org/eclipse/papyrus/infra/emf/expressions/booleanexpressions/util/BooleanExpressionsSwitch.java @@ -83,6 +83,8 @@ public class BooleanExpressionsSwitch<T> extends Switch<T> { case BooleanExpressionsPackage.OR_EXPRESSION: { OrExpression orExpression = (OrExpression)theEObject; T result = caseOrExpression(orExpression); + if (result == null) result = caseAbstractMultiBooleanEObjectExpressionsReferenceExpression(orExpression); + if (result == null) result = caseAbtractMultiBooleanEObjectExpressionsOwnedExpression(orExpression); if (result == null) result = caseIBooleanEObjectExpression(orExpression); if (result == null) result = caseIBooleanExpression(orExpression); if (result == null) result = caseIExpression(orExpression); @@ -90,6 +92,16 @@ public class BooleanExpressionsSwitch<T> extends Switch<T> { if (result == null) result = defaultCase(theEObject); return result; } + case BooleanExpressionsPackage.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION: { + AbtractMultiBooleanEObjectExpressionsOwnedExpression abtractMultiBooleanEObjectExpressionsOwnedExpression = (AbtractMultiBooleanEObjectExpressionsOwnedExpression)theEObject; + T result = caseAbtractMultiBooleanEObjectExpressionsOwnedExpression(abtractMultiBooleanEObjectExpressionsOwnedExpression); + if (result == null) result = caseIBooleanEObjectExpression(abtractMultiBooleanEObjectExpressionsOwnedExpression); + if (result == null) result = caseIBooleanExpression(abtractMultiBooleanEObjectExpressionsOwnedExpression); + if (result == null) result = caseIExpression(abtractMultiBooleanEObjectExpressionsOwnedExpression); + if (result == null) result = caseIBasicExpressionElement(abtractMultiBooleanEObjectExpressionsOwnedExpression); + if (result == null) result = defaultCase(theEObject); + return result; + } case BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION: { IBooleanEObjectExpression iBooleanEObjectExpression = (IBooleanEObjectExpression)theEObject; T result = caseIBooleanEObjectExpression(iBooleanEObjectExpression); @@ -107,9 +119,21 @@ public class BooleanExpressionsSwitch<T> extends Switch<T> { if (result == null) result = defaultCase(theEObject); return result; } + case BooleanExpressionsPackage.ABSTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_REFERENCE_EXPRESSION: { + AbstractMultiBooleanEObjectExpressionsReferenceExpression abstractMultiBooleanEObjectExpressionsReferenceExpression = (AbstractMultiBooleanEObjectExpressionsReferenceExpression)theEObject; + T result = caseAbstractMultiBooleanEObjectExpressionsReferenceExpression(abstractMultiBooleanEObjectExpressionsReferenceExpression); + if (result == null) result = caseIBooleanEObjectExpression(abstractMultiBooleanEObjectExpressionsReferenceExpression); + if (result == null) result = caseIBooleanExpression(abstractMultiBooleanEObjectExpressionsReferenceExpression); + if (result == null) result = caseIExpression(abstractMultiBooleanEObjectExpressionsReferenceExpression); + if (result == null) result = caseIBasicExpressionElement(abstractMultiBooleanEObjectExpressionsReferenceExpression); + if (result == null) result = defaultCase(theEObject); + return result; + } case BooleanExpressionsPackage.AND_EXPRESSION: { AndExpression andExpression = (AndExpression)theEObject; T result = caseAndExpression(andExpression); + if (result == null) result = caseAbstractMultiBooleanEObjectExpressionsReferenceExpression(andExpression); + if (result == null) result = caseAbtractMultiBooleanEObjectExpressionsOwnedExpression(andExpression); if (result == null) result = caseIBooleanEObjectExpression(andExpression); if (result == null) result = caseIBooleanExpression(andExpression); if (result == null) result = caseIExpression(andExpression); @@ -120,6 +144,8 @@ public class BooleanExpressionsSwitch<T> extends Switch<T> { case BooleanExpressionsPackage.NOT_EXPRESSION: { NotExpression notExpression = (NotExpression)theEObject; T result = caseNotExpression(notExpression); + if (result == null) result = caseAbstractSingleBooleanEObjectExpressionOwnedExpression(notExpression); + if (result == null) result = caseAbstractSingleBooleanEObjectExpressionReferenceExpression(notExpression); if (result == null) result = caseIBooleanEObjectExpression(notExpression); if (result == null) result = caseIBooleanExpression(notExpression); if (result == null) result = caseIExpression(notExpression); @@ -127,6 +153,26 @@ public class BooleanExpressionsSwitch<T> extends Switch<T> { if (result == null) result = defaultCase(theEObject); return result; } + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION: { + AbstractSingleBooleanEObjectExpressionOwnedExpression abstractSingleBooleanEObjectExpressionOwnedExpression = (AbstractSingleBooleanEObjectExpressionOwnedExpression)theEObject; + T result = caseAbstractSingleBooleanEObjectExpressionOwnedExpression(abstractSingleBooleanEObjectExpressionOwnedExpression); + if (result == null) result = caseIBooleanEObjectExpression(abstractSingleBooleanEObjectExpressionOwnedExpression); + if (result == null) result = caseIBooleanExpression(abstractSingleBooleanEObjectExpressionOwnedExpression); + if (result == null) result = caseIExpression(abstractSingleBooleanEObjectExpressionOwnedExpression); + if (result == null) result = caseIBasicExpressionElement(abstractSingleBooleanEObjectExpressionOwnedExpression); + if (result == null) result = defaultCase(theEObject); + return result; + } + case BooleanExpressionsPackage.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_REFERENCE_EXPRESSION: { + AbstractSingleBooleanEObjectExpressionReferenceExpression abstractSingleBooleanEObjectExpressionReferenceExpression = (AbstractSingleBooleanEObjectExpressionReferenceExpression)theEObject; + T result = caseAbstractSingleBooleanEObjectExpressionReferenceExpression(abstractSingleBooleanEObjectExpressionReferenceExpression); + if (result == null) result = caseIBooleanEObjectExpression(abstractSingleBooleanEObjectExpressionReferenceExpression); + if (result == null) result = caseIBooleanExpression(abstractSingleBooleanEObjectExpressionReferenceExpression); + if (result == null) result = caseIExpression(abstractSingleBooleanEObjectExpressionReferenceExpression); + if (result == null) result = caseIBasicExpressionElement(abstractSingleBooleanEObjectExpressionReferenceExpression); + if (result == null) result = defaultCase(theEObject); + return result; + } case BooleanExpressionsPackage.LITERAL_TRUE_EXPRESSION: { LiteralTrueExpression literalTrueExpression = (LiteralTrueExpression)theEObject; T result = caseLiteralTrueExpression(literalTrueExpression); @@ -150,6 +196,7 @@ public class BooleanExpressionsSwitch<T> extends Switch<T> { case BooleanExpressionsPackage.REFERENCE_BOOLEAN_EXPRESSION: { ReferenceBooleanExpression referenceBooleanExpression = (ReferenceBooleanExpression)theEObject; T result = caseReferenceBooleanExpression(referenceBooleanExpression); + if (result == null) result = caseAbstractSingleBooleanEObjectExpressionReferenceExpression(referenceBooleanExpression); if (result == null) result = caseIBooleanEObjectExpression(referenceBooleanExpression); if (result == null) result = caseIBooleanExpression(referenceBooleanExpression); if (result == null) result = caseIExpression(referenceBooleanExpression); @@ -187,6 +234,21 @@ public class BooleanExpressionsSwitch<T> extends Switch<T> { } /** + * Returns the result of interpreting the object as an instance of '<em>Abtract Multi Boolean EObject Expressions Owned Expression</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Abtract Multi Boolean EObject Expressions Owned Expression</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseAbtractMultiBooleanEObjectExpressionsOwnedExpression(AbtractMultiBooleanEObjectExpressionsOwnedExpression object) { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>IBoolean EObject Expression</em>'. * <!-- begin-user-doc --> * This implementation returns null; @@ -217,6 +279,21 @@ public class BooleanExpressionsSwitch<T> extends Switch<T> { } /** + * Returns the result of interpreting the object as an instance of '<em>Abstract Multi Boolean EObject Expressions Reference Expression</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Abstract Multi Boolean EObject Expressions Reference Expression</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseAbstractMultiBooleanEObjectExpressionsReferenceExpression(AbstractMultiBooleanEObjectExpressionsReferenceExpression object) { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>And Expression</em>'. * <!-- begin-user-doc --> * This implementation returns null; @@ -247,6 +324,36 @@ public class BooleanExpressionsSwitch<T> extends Switch<T> { } /** + * Returns the result of interpreting the object as an instance of '<em>Abstract Single Boolean EObject Expression Owned Expression</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Abstract Single Boolean EObject Expression Owned Expression</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseAbstractSingleBooleanEObjectExpressionOwnedExpression(AbstractSingleBooleanEObjectExpressionOwnedExpression object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>Abstract Single Boolean EObject Expression Reference Expression</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Abstract Single Boolean EObject Expression Reference Expression</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseAbstractSingleBooleanEObjectExpressionReferenceExpression(AbstractSingleBooleanEObjectExpressionReferenceExpression object) { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>Literal True Expression</em>'. * <!-- begin-user-doc --> * This implementation returns null; |