diff options
Diffstat (limited to 'plugins/uml/expressions')
98 files changed, 5444 insertions, 3257 deletions
diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/.classpath b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/.classpath index 858bac421b8..50aae142c50 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/.classpath +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/.classpath @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src-gen"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src-gen"/> + <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/.settings/org.eclipse.jdt.core.prefs index e62259848fc..49ce3e32edf 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,17 +1,18 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -19,17 +20,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -115,11 +119,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -150,6 +155,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -174,13 +181,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -228,6 +239,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -264,9 +277,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -292,6 +308,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/META-INF/MANIFEST.MF b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/META-INF/MANIFEST.MF index 4a9e05beb49..f9be030732d 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/META-INF/MANIFEST.MF +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.uml.expressions.edit;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.uml.expressions.umlexpressions.provider.UmlexpressionsEditPlugin$Implementation Bundle-Vendor: %providerName @@ -14,7 +14,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)", org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)", org.eclipse.papyrus.infra.emf.expressions.edit;bundle-version="[1.0.0,2.0.0)", - org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)" + org.eclipse.emf.ecore;bundle-version="[2.17.0,3.0.0)", + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)", + org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)", + org.eclipse.papyrus.emf.ui;bundle-version="[1.0.0,2.0.0)", + org.eclipse.emf.edit.ui;bundle-version="[2.16.0,3.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)" Bundle-ActivationPolicy: lazy Bundle-Description: EMF Edit plugin for UML Expressions. It provides icons and item provider for the UML Expressions objects. Automatic-Module-Name: org.eclipse.papyrus.uml.expressions.edit diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/README b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/README new file mode 100755 index 00000000000..8ff0c86b484 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/README @@ -0,0 +1,2 @@ +the main part of the internal code must be moved into org.eclipse.papyrus.uml.ui once this plugin will be refactored too +(see bugs 548391 and 548392)
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/build.properties b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/build.properties index 56ec35b5119..ccf9b8c5fec 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/build.properties +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/build.properties @@ -18,6 +18,7 @@ bin.includes = .,\ plugin.properties,\ about.html jars.compile.order = . -source.. = src-gen/ +source.. = src-gen/,\ + src/ output.. = bin/ src.includes = about.html diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/custom_icons/full/obj16/IsKindOfStereotypeExpression.gif b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/custom_icons/full/obj16/IsKindOfStereotypeExpression.gif Binary files differnew file mode 100755 index 00000000000..02931df6fe4 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/custom_icons/full/obj16/IsKindOfStereotypeExpression.gif diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/custom_icons/full/obj16/IsTypeOfStereotypeExpression.gif b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/custom_icons/full/obj16/IsTypeOfStereotypeExpression.gif Binary files differnew file mode 100755 index 00000000000..9a66ee84295 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/custom_icons/full/obj16/IsTypeOfStereotypeExpression.gif diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/custom_icons/full/obj16/SingleStereotypeAttributeEqualityExpression.gif b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/custom_icons/full/obj16/SingleStereotypeAttributeEqualityExpression.gif Binary files differnew file mode 100755 index 00000000000..f776572fcf5 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/custom_icons/full/obj16/SingleStereotypeAttributeEqualityExpression.gif diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/icons/full/obj16/SingleStereotypeAttributeEqualityExpression.gif b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/icons/full/obj16/SingleStereotypeAttributeEqualityExpression.gif Binary files differnew file mode 100755 index 00000000000..f776572fcf5 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/icons/full/obj16/SingleStereotypeAttributeEqualityExpression.gif diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/plugin.properties b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/plugin.properties index 4107fcb3b52..ef0fcdd2688 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/plugin.properties +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/plugin.properties @@ -13,34 +13,27 @@ pluginName = Papyrus UML Expressions Edit Support providerName = Eclipse Modeling Project - _UI_CreateChild_text = {0} -_UI_CreateChild_text2 = {1} {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_IsStereotypedWithExpression_type = Is Stereotyped With Expression -_UI_Unknown_type = Object - -_UI_Unknown_datatype= Value - -_UI_IsStereotypedWithExpression_stereotypeQualifiedName_feature = Stereotype Qualified Name -_UI_Unknown_feature = Unspecified - +_UI_AbstractStereotypeExpression_type = Abstract Stereotype Expression _UI_HasAppliedStereotypesExpression_type = Has Applied Stereotypes Expression -_UI_IsStereotypedWithExpression_profileURI_feature = Profile URI -_UI_IsInstanceOfExpression_umlMetaclass_feature = Uml Metaclass _UI_IsTypeOfExpression_type = Is Type Of Expression +_UI_AbstractUMLEClassExpression_type = Abstract UMLE Class Expression _UI_IsKindOfExpression_type = Is Kind Of Expression -_UI_IsTypeOfExpression_umlEClass_feature = Uml EClass -_UI_IsKindOfExpression_umlEClass_feature = Uml EClass _UI_IsKindOfStereotypeExpression_type = Is Kind Of Stereotype Expression _UI_IsTypeOfStereotypeExpression_type = Is Type Of Stereotype Expression -_UI_IsKindOfStereotypeExpression_stereotypeQualifiedName_feature = Stereotype Qualified Name -_UI_IsTypeOfStereotypeExpression_stereotypeQualifiedName_feature = Stereotype Qualified Name -_UI_IsKindOfStereotypeExpression_profileURI_feature = Profile URI -_UI_IsTypeOfStereotypeExpression_profileURI_feature = Profile URI +_UI_SingleStereotypeAttributeEqualityExpression_type = Single Stereotype Attribute Equality Expression +_UI_Unknown_type = Object +_UI_Unknown_datatype= Value +_UI_AbstractStereotypeExpression_stereotypeQualifiedName_feature = Stereotype Qualified Name +_UI_AbstractStereotypeExpression_profileURI_feature = Profile URI +_UI_AbstractUMLEClassExpression_umlEClass_feature = Uml EClass +_UI_SingleStereotypeAttributeEqualityExpression_expectedValue_feature = Expected Value +_UI_SingleStereotypeAttributeEqualityExpression_propertyName_feature = Property Name +_UI_Unknown_feature = Unspecified diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/plugin.xml b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/plugin.xml index 7dc9a9a89ee..fa9562ef9b4 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/plugin.xml +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/plugin.xml @@ -40,4 +40,38 @@ uri="http://www.eclipse.org/papyrus/expressions/booleanexpressions" class="org.eclipse.papyrus.uml.expressions.umlexpressions.provider.UMLExpressionsItemProviderAdapterFactory$BooleanExpressionsChildCreationExtender"/> </extension> + <extension + point="org.eclipse.emf.edit.propertyEditorFactories"> + <factory + class="org.eclipse.papyrus.uml.expressions.edit.internal.editors.factory.SingleStereotypeQualifiedNameEditorFactory" + uri="http://www.eclipse.org/papyrus/umlExpressions/StereotypeExpression/StereotypeQualifiedName"> + </factory> + <factory + class="org.eclipse.papyrus.uml.expressions.edit.internal.editors.factory.SingleProfileURIEditorFactory" + uri="http://www.eclipse.org/papyrus/umlExpressions/StereotypeExpression/ProfileURI"> + </factory> + <factory + class="org.eclipse.papyrus.uml.expressions.edit.internal.editors.factory.SingleStereotypeAttributeEditorFactory" + uri="http://www.eclipse.org/papyrus/umlExpressions/StereotypeAttributeEqualityExpression/AttributeName"> + </factory> + <factory + class="org.eclipse.papyrus.uml.expressions.edit.internal.editors.factory.SingleUMLEClassEditorFactory" + uri="http://www.eclipse.org/papyrus/umlExpressions/UMLEClassExpression/UMLEClass"> + </factory> + </extension> + <extension + point="org.eclipse.ui.views.properties.tabbed.propertySections"> + <propertySections + contributorId="TreeOutlinePage"> + <propertySection + class="org.eclipse.papyrus.uml.expressions.edit.internal.sections.UMLExpressionPropertySection" + filter="org.eclipse.papyrus.uml.expressions.edit.internal.sections.UMLExpressionSectionFilter" + id="org.eclipse.papyrus.uml.expression.properties.propertySection" + tab="advanced"> + <input + type="java.lang.Object"> + </input> + </propertySection> + </propertySections> + </extension> </plugin> diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/pom.xml b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/pom.xml index 1b78c9e8ebf..4290265d4ed 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/pom.xml +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/pom.xml @@ -8,7 +8,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.expressions.edit</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <description>EMF Edit plugin for UML Expressions. It provides icons and item provider for the UML Expressions objects.</description> </project>
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/AbstractStereotypeExpressionItemProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/AbstractStereotypeExpressionItemProvider.java new file mode 100755 index 00000000000..d83680231ee --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/AbstractStereotypeExpressionItemProvider.java @@ -0,0 +1,246 @@ +/** + * 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.uml.expressions.umlexpressions.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.uml.expressions.umlexpressions.AbstractStereotypeExpression; +import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; + +/** + * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractStereotypeExpression} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class AbstractStereotypeExpressionItemProvider + 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 AbstractStereotypeExpressionItemProvider(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); + addStereotypeQualifiedNamePropertyDescriptor(object); + addProfileURIPropertyDescriptor(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 Stereotype Qualified Name feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addStereotypeQualifiedNamePropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_AbstractStereotypeExpression_stereotypeQualifiedName_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_AbstractStereotypeExpression_stereotypeQualifiedName_feature", "_UI_AbstractStereotypeExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + UMLExpressionsPackage.Literals.ABSTRACT_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null, + URI.createURI("http://www.eclipse.org/papyrus/umlExpressions/StereotypeExpression/StereotypeQualifiedName"))); + } + + /** + * This adds a property descriptor for the Profile URI feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addProfileURIPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_AbstractStereotypeExpression_profileURI_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_AbstractStereotypeExpression_profileURI_feature", "_UI_AbstractStereotypeExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + UMLExpressionsPackage.Literals.ABSTRACT_STEREOTYPE_EXPRESSION__PROFILE_URI, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null, + URI.createURI("http://www.eclipse.org/papyrus/umlExpressions/StereotypeExpression/ProfileURI"))); + } + + /** + * <!-- 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 = ((AbstractStereotypeExpression)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_AbstractStereotypeExpression_type") : //$NON-NLS-1$ + getString("_UI_AbstractStereotypeExpression_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(AbstractStereotypeExpression.class)) { + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__NAME: + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__DESCRIPTION: + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__PROFILE_URI: + 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/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/AbstractUMLEClassExpressionItemProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/AbstractUMLEClassExpressionItemProvider.java new file mode 100755 index 00000000000..717c7732f53 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/AbstractUMLEClassExpressionItemProvider.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.uml.expressions.umlexpressions.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.uml.expressions.umlexpressions.AbstractUMLEClassExpression; +import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; + +/** + * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractUMLEClassExpression} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class AbstractUMLEClassExpressionItemProvider + 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 AbstractUMLEClassExpressionItemProvider(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); + addUmlEClassPropertyDescriptor(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 Uml EClass feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addUmlEClassPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_AbstractUMLEClassExpression_umlEClass_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_AbstractUMLEClassExpression_umlEClass_feature", "_UI_AbstractUMLEClassExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + UMLExpressionsPackage.Literals.ABSTRACT_UMLE_CLASS_EXPRESSION__UML_ECLASS, + true, + false, + true, + null, + null, + null, + URI.createURI("http://www.eclipse.org/papyrus/umlExpressions/UMLEClassExpression/UMLEClass"))); + } + + /** + * <!-- 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 = ((AbstractUMLEClassExpression)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_AbstractUMLEClassExpression_type") : //$NON-NLS-1$ + getString("_UI_AbstractUMLEClassExpression_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(AbstractUMLEClassExpression.class)) { + case UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__NAME: + case UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_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/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/HasAppliedStereotypesExpressionItemProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/HasAppliedStereotypesExpressionItemProvider.java index e3ece143c16..99073650645 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/HasAppliedStereotypesExpressionItemProvider.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/HasAppliedStereotypesExpressionItemProvider.java @@ -1,16 +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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.provider; @@ -159,7 +158,7 @@ public class HasAppliedStereotypesExpressionItemProvider getString("_UI_HasAppliedStereotypesExpression_type") : //$NON-NLS-1$ getString("_UI_HasAppliedStereotypesExpression_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } - + /** * This handles model notifications by calling {@link #updateChildren} to update any cached diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsKindOfExpressionItemProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsKindOfExpressionItemProvider.java index 2f778653047..d44a0936866 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsKindOfExpressionItemProvider.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsKindOfExpressionItemProvider.java @@ -1,16 +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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.provider; @@ -21,24 +20,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.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.uml.expressions.umlexpressions.IsKindOfExpression; -import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; /** * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfExpression} object. @@ -46,14 +30,7 @@ import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; * <!-- end-user-doc --> * @generated */ -public class IsKindOfExpressionItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { +public class IsKindOfExpressionItemProvider extends AbstractUMLEClassExpressionItemProvider { /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> @@ -75,80 +52,11 @@ public class IsKindOfExpressionItemProvider if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addNamePropertyDescriptor(object); - addDescriptionPropertyDescriptor(object); - addUmlEClassPropertyDescriptor(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 Uml EClass feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addUmlEClassPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IsKindOfExpression_umlEClass_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IsKindOfExpression_umlEClass_feature", "_UI_IsKindOfExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - UMLExpressionsPackage.Literals.IS_KIND_OF_EXPRESSION__UML_ECLASS, - true, - false, - true, - null, - null, - null)); - } - - /** * This returns IsKindOfExpression.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -182,7 +90,7 @@ public class IsKindOfExpressionItemProvider getString("_UI_IsKindOfExpression_type") : //$NON-NLS-1$ getString("_UI_IsKindOfExpression_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } - + /** * This handles model notifications by calling {@link #updateChildren} to update any cached @@ -194,13 +102,6 @@ public class IsKindOfExpressionItemProvider @Override public void notifyChanged(Notification notification) { updateChildren(notification); - - switch (notification.getFeatureID(IsKindOfExpression.class)) { - case UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__NAME: - case UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__DESCRIPTION: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } super.notifyChanged(notification); } @@ -216,15 +117,4 @@ public class IsKindOfExpressionItemProvider 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/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsKindOfStereotypeExpressionItemProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsKindOfStereotypeExpressionItemProvider.java index 69395a9f2be..feb9f50f898 100644..100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsKindOfStereotypeExpressionItemProvider.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsKindOfStereotypeExpressionItemProvider.java @@ -1,16 +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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.provider; @@ -21,22 +20,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.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.uml.expressions.umlexpressions.IsKindOfStereotypeExpression; -import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; /** * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression} object. @@ -44,14 +30,7 @@ import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; * <!-- end-user-doc --> * @generated */ -public class IsKindOfStereotypeExpressionItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { +public class IsKindOfStereotypeExpressionItemProvider extends AbstractStereotypeExpressionItemProvider { /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> @@ -73,103 +52,11 @@ public class IsKindOfStereotypeExpressionItemProvider if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addNamePropertyDescriptor(object); - addDescriptionPropertyDescriptor(object); - addStereotypeQualifiedNamePropertyDescriptor(object); - addProfileURIPropertyDescriptor(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 Stereotype Qualified Name feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addStereotypeQualifiedNamePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IsKindOfStereotypeExpression_stereotypeQualifiedName_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IsKindOfStereotypeExpression_stereotypeQualifiedName_feature", "_UI_IsKindOfStereotypeExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - UMLExpressionsPackage.Literals.IS_KIND_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Profile URI feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addProfileURIPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IsKindOfStereotypeExpression_profileURI_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IsKindOfStereotypeExpression_profileURI_feature", "_UI_IsKindOfStereotypeExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - UMLExpressionsPackage.Literals.IS_KIND_OF_STEREOTYPE_EXPRESSION__PROFILE_URI, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** * This returns IsKindOfStereotypeExpression.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -203,7 +90,7 @@ public class IsKindOfStereotypeExpressionItemProvider getString("_UI_IsKindOfStereotypeExpression_type") : //$NON-NLS-1$ getString("_UI_IsKindOfStereotypeExpression_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } - + /** * This handles model notifications by calling {@link #updateChildren} to update any cached @@ -215,15 +102,6 @@ public class IsKindOfStereotypeExpressionItemProvider @Override public void notifyChanged(Notification notification) { updateChildren(notification); - - switch (notification.getFeatureID(IsKindOfStereotypeExpression.class)) { - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__NAME: - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__DESCRIPTION: - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__PROFILE_URI: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } super.notifyChanged(notification); } @@ -239,15 +117,4 @@ public class IsKindOfStereotypeExpressionItemProvider 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/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsStereotypedWithExpressionItemProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsStereotypedWithExpressionItemProvider.java index cfa302b44bb..b9804c5bcc0 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsStereotypedWithExpressionItemProvider.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsStereotypedWithExpressionItemProvider.java @@ -1,16 +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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.provider; @@ -21,24 +20,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.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.uml.expressions.umlexpressions.IsStereotypedWithExpression; -import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; /** * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsStereotypedWithExpression} object. @@ -46,14 +30,7 @@ import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; * <!-- end-user-doc --> * @generated */ -public class IsStereotypedWithExpressionItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { +public class IsStereotypedWithExpressionItemProvider extends AbstractStereotypeExpressionItemProvider { /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> @@ -75,103 +52,11 @@ public class IsStereotypedWithExpressionItemProvider if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addNamePropertyDescriptor(object); - addDescriptionPropertyDescriptor(object); - addStereotypeQualifiedNamePropertyDescriptor(object); - addProfileURIPropertyDescriptor(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 Stereotype Qualified Name feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addStereotypeQualifiedNamePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IsStereotypedWithExpression_stereotypeQualifiedName_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IsStereotypedWithExpression_stereotypeQualifiedName_feature", "_UI_IsStereotypedWithExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - UMLExpressionsPackage.Literals.IS_STEREOTYPED_WITH_EXPRESSION__STEREOTYPE_QUALIFIED_NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Profile URI feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addProfileURIPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IsStereotypedWithExpression_profileURI_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IsStereotypedWithExpression_profileURI_feature", "_UI_IsStereotypedWithExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - UMLExpressionsPackage.Literals.IS_STEREOTYPED_WITH_EXPRESSION__PROFILE_URI, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** * This returns IsStereotypedWithExpression.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -205,7 +90,7 @@ public class IsStereotypedWithExpressionItemProvider getString("_UI_IsStereotypedWithExpression_type") : //$NON-NLS-1$ getString("_UI_IsStereotypedWithExpression_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } - + /** * This handles model notifications by calling {@link #updateChildren} to update any cached @@ -217,15 +102,6 @@ public class IsStereotypedWithExpressionItemProvider @Override public void notifyChanged(Notification notification) { updateChildren(notification); - - switch (notification.getFeatureID(IsStereotypedWithExpression.class)) { - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__NAME: - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__DESCRIPTION: - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__PROFILE_URI: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } super.notifyChanged(notification); } @@ -241,15 +117,4 @@ public class IsStereotypedWithExpressionItemProvider 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/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsTypeOfExpressionItemProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsTypeOfExpressionItemProvider.java index 6f0389dc68e..499572d8cfb 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsTypeOfExpressionItemProvider.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsTypeOfExpressionItemProvider.java @@ -1,16 +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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.provider; @@ -21,24 +20,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.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.uml.expressions.umlexpressions.IsTypeOfExpression; -import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; /** * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfExpression} object. @@ -46,14 +30,7 @@ import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; * <!-- end-user-doc --> * @generated */ -public class IsTypeOfExpressionItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { +public class IsTypeOfExpressionItemProvider extends AbstractUMLEClassExpressionItemProvider { /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> @@ -75,80 +52,11 @@ public class IsTypeOfExpressionItemProvider if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addNamePropertyDescriptor(object); - addDescriptionPropertyDescriptor(object); - addUmlEClassPropertyDescriptor(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 Uml EClass feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addUmlEClassPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IsTypeOfExpression_umlEClass_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IsTypeOfExpression_umlEClass_feature", "_UI_IsTypeOfExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - UMLExpressionsPackage.Literals.IS_TYPE_OF_EXPRESSION__UML_ECLASS, - true, - false, - true, - null, - null, - null)); - } - - /** * This returns IsTypeOfExpression.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -182,7 +90,7 @@ public class IsTypeOfExpressionItemProvider getString("_UI_IsTypeOfExpression_type") : //$NON-NLS-1$ getString("_UI_IsTypeOfExpression_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } - + /** * This handles model notifications by calling {@link #updateChildren} to update any cached @@ -194,13 +102,6 @@ public class IsTypeOfExpressionItemProvider @Override public void notifyChanged(Notification notification) { updateChildren(notification); - - switch (notification.getFeatureID(IsTypeOfExpression.class)) { - case UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__NAME: - case UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__DESCRIPTION: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } super.notifyChanged(notification); } @@ -216,15 +117,4 @@ public class IsTypeOfExpressionItemProvider 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/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsTypeOfStereotypeExpressionItemProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsTypeOfStereotypeExpressionItemProvider.java index fb2a55086bd..12290c0fd2c 100644..100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsTypeOfStereotypeExpressionItemProvider.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsTypeOfStereotypeExpressionItemProvider.java @@ -1,16 +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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.provider; @@ -21,22 +20,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.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.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression; -import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; /** * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression} object. @@ -44,14 +30,7 @@ import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; * <!-- end-user-doc --> * @generated */ -public class IsTypeOfStereotypeExpressionItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { +public class IsTypeOfStereotypeExpressionItemProvider extends AbstractStereotypeExpressionItemProvider { /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> @@ -73,103 +52,11 @@ public class IsTypeOfStereotypeExpressionItemProvider if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addNamePropertyDescriptor(object); - addDescriptionPropertyDescriptor(object); - addStereotypeQualifiedNamePropertyDescriptor(object); - addProfileURIPropertyDescriptor(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 Stereotype Qualified Name feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addStereotypeQualifiedNamePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IsTypeOfStereotypeExpression_stereotypeQualifiedName_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IsTypeOfStereotypeExpression_stereotypeQualifiedName_feature", "_UI_IsTypeOfStereotypeExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - UMLExpressionsPackage.Literals.IS_TYPE_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Profile URI feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addProfileURIPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IsTypeOfStereotypeExpression_profileURI_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IsTypeOfStereotypeExpression_profileURI_feature", "_UI_IsTypeOfStereotypeExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - UMLExpressionsPackage.Literals.IS_TYPE_OF_STEREOTYPE_EXPRESSION__PROFILE_URI, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** * This returns IsTypeOfStereotypeExpression.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -203,7 +90,7 @@ public class IsTypeOfStereotypeExpressionItemProvider getString("_UI_IsTypeOfStereotypeExpression_type") : //$NON-NLS-1$ getString("_UI_IsTypeOfStereotypeExpression_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } - + /** * This handles model notifications by calling {@link #updateChildren} to update any cached @@ -215,15 +102,6 @@ public class IsTypeOfStereotypeExpressionItemProvider @Override public void notifyChanged(Notification notification) { updateChildren(notification); - - switch (notification.getFeatureID(IsTypeOfStereotypeExpression.class)) { - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__NAME: - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__DESCRIPTION: - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__PROFILE_URI: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } super.notifyChanged(notification); } @@ -239,15 +117,4 @@ public class IsTypeOfStereotypeExpressionItemProvider 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/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/SingleStereotypeAttributeEqualityExpressionItemProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/SingleStereotypeAttributeEqualityExpressionItemProvider.java new file mode 100755 index 00000000000..6b58d258c8c --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/SingleStereotypeAttributeEqualityExpressionItemProvider.java @@ -0,0 +1,180 @@ +/** + * 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.uml.expressions.umlexpressions.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.URI; + +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ViewerNotification; + +import org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression; +import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; + +/** + * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class SingleStereotypeAttributeEqualityExpressionItemProvider extends AbstractStereotypeExpressionItemProvider { + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public SingleStereotypeAttributeEqualityExpressionItemProvider(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); + + addExpectedValuePropertyDescriptor(object); + addPropertyNamePropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Expected Value feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addExpectedValuePropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_SingleStereotypeAttributeEqualityExpression_expectedValue_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_SingleStereotypeAttributeEqualityExpression_expectedValue_feature", "_UI_SingleStereotypeAttributeEqualityExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + UMLExpressionsPackage.Literals.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__EXPECTED_VALUE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the Property Name feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addPropertyNamePropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_SingleStereotypeAttributeEqualityExpression_propertyName_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_SingleStereotypeAttributeEqualityExpression_propertyName_feature", "_UI_SingleStereotypeAttributeEqualityExpression_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + UMLExpressionsPackage.Literals.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__PROPERTY_NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null, + URI.createURI("http://www.eclipse.org/papyrus/umlExpressions/StereotypeAttributeEqualityExpression/AttributeName"))); + } + + /** + * This returns SingleStereotypeAttributeEqualityExpression.gif. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object getImage(Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/SingleStereotypeAttributeEqualityExpression")); //$NON-NLS-1$ + } + + /** + * <!-- 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 = ((SingleStereotypeAttributeEqualityExpression)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_SingleStereotypeAttributeEqualityExpression_type") : //$NON-NLS-1$ + getString("_UI_SingleStereotypeAttributeEqualityExpression_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(SingleStereotypeAttributeEqualityExpression.class)) { + case UMLExpressionsPackage.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__EXPECTED_VALUE: + case UMLExpressionsPackage.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__PROPERTY_NAME: + 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); + } + +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/UMLExpressionsItemProviderAdapterFactory.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/UMLExpressionsItemProviderAdapterFactory.java index 1bb98a2c860..5afc14b0422 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/UMLExpressionsItemProviderAdapterFactory.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/UMLExpressionsItemProviderAdapterFactory.java @@ -1,31 +1,34 @@ /** * 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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.provider; import java.util.ArrayList; import java.util.Collection; - import java.util.List; + import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.util.ResourceLocator; + import org.eclipse.emf.ecore.EObject; + import org.eclipse.emf.edit.command.CommandParameter; + import org.eclipse.emf.edit.domain.EditingDomain; + import org.eclipse.emf.edit.provider.ChangeNotifier; import org.eclipse.emf.edit.provider.ChildCreationExtenderManager; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -39,15 +42,21 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.INotifyChangedListener; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; + import org.eclipse.papyrus.infra.emf.expressions.ExpressionCatalog; 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.AbtractMultiBooleanEObjectExpressionsOwnedExpression; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; + import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.util.BooleanExpressionsSwitch; + import org.eclipse.papyrus.infra.emf.expressions.util.ExpressionsSwitch; + import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsFactory; import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; + import org.eclipse.papyrus.uml.expressions.umlexpressions.util.UMLExpressionsAdapterFactory; /** @@ -245,6 +254,29 @@ public class UMLExpressionsItemProviderAdapterFactory extends UMLExpressionsAdap } /** + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression} instances. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected SingleStereotypeAttributeEqualityExpressionItemProvider singleStereotypeAttributeEqualityExpressionItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Adapter createSingleStereotypeAttributeEqualityExpressionAdapter() { + if (singleStereotypeAttributeEqualityExpressionItemProvider == null) { + singleStereotypeAttributeEqualityExpressionItemProvider = new SingleStereotypeAttributeEqualityExpressionItemProvider(this); + } + + return singleStereotypeAttributeEqualityExpressionItemProvider; + } + + /** * This returns the root adapter factory that contains this factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -382,6 +414,7 @@ public class UMLExpressionsItemProviderAdapterFactory extends UMLExpressionsAdap if (isKindOfExpressionItemProvider != null) isKindOfExpressionItemProvider.dispose(); if (isKindOfStereotypeExpressionItemProvider != null) isKindOfStereotypeExpressionItemProvider.dispose(); if (isTypeOfStereotypeExpressionItemProvider != null) isTypeOfStereotypeExpressionItemProvider.dispose(); + if (singleStereotypeAttributeEqualityExpressionItemProvider != null) singleStereotypeAttributeEqualityExpressionItemProvider.dispose(); } /** @@ -461,6 +494,11 @@ public class UMLExpressionsItemProviderAdapterFactory extends UMLExpressionsAdap (ExpressionsPackage.Literals.EXPRESSION_CATALOG__EXPRESSIONS, UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression())); + newChildDescriptors.add + (createChildParameter + (ExpressionsPackage.Literals.EXPRESSION_CATALOG__EXPRESSIONS, + UMLExpressionsFactory.eINSTANCE.createSingleStereotypeAttributeEqualityExpression())); + return null; } @@ -573,8 +611,14 @@ public class UMLExpressionsItemProviderAdapterFactory extends UMLExpressionsAdap (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression())); + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABTRACT_MULTI_BOOLEAN_EOBJECT_EXPRESSIONS_OWNED_EXPRESSION__OWNED_EXPRESSIONS, + UMLExpressionsFactory.eINSTANCE.createSingleStereotypeAttributeEqualityExpression())); + return null; } + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -612,8 +656,14 @@ public class UMLExpressionsItemProviderAdapterFactory extends UMLExpressionsAdap (BooleanExpressionsPackage.Literals.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION, UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression())); + newChildDescriptors.add + (createChildParameter + (BooleanExpressionsPackage.Literals.ABSTRACT_SINGLE_BOOLEAN_EOBJECT_EXPRESSION_OWNED_EXPRESSION__OWNED_EXPRESSION, + UMLExpressionsFactory.eINSTANCE.createSingleStereotypeAttributeEqualityExpression())); + return null; } + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/UmlexpressionsEditPlugin.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/UmlexpressionsEditPlugin.java index 60d404e59d1..37912d7d7f8 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/UmlexpressionsEditPlugin.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/UmlexpressionsEditPlugin.java @@ -1,16 +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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.provider; @@ -19,6 +18,7 @@ import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.provider.EcoreEditPlugin; + import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin; /** diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/converters/ProfileURIDisplayConverter.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/converters/ProfileURIDisplayConverter.java new file mode 100755 index 00000000000..53e31d14a80 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/converters/ProfileURIDisplayConverter.java @@ -0,0 +1,64 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.converters; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.emf.ui.converters.IDisplayConverter; +import org.eclipse.papyrus.uml.expressions.edit.internal.utils.ProfileUtils; +import org.eclipse.uml2.uml.Profile; +import org.eclipse.uml2.uml.Stereotype; + +/** + * Converter from Profile to URI and URI to Profile + */ +public class ProfileURIDisplayConverter implements IDisplayConverter { + + /** + * + * @see org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.converters.IDisplayConverter#semanticToDisplayValue(java.lang.Object, org.eclipse.emf.ecore.EObject) + * + * @param canonicalValue + * @param editedObject + * @return + */ + @Override + public Object semanticToDisplayValue(final Object canonicalValue, final EObject editedObject) { + if (canonicalValue instanceof String && ((String) canonicalValue).length() > 0) { + final String stereotypeQualifiedName = (String) canonicalValue; + final Stereotype ste = ProfileUtils.findStereotype(editedObject, stereotypeQualifiedName); + if (null != ste) { + return ste; + } + } + // required to avoid to lost the value when we can't resolve it + return canonicalValue; + } + + /** + * @see org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.converters.IDisplayConverter#displayToSemanticValue(java.lang.Object) + * + * @param displayValue + * @return + */ + @Override + public Object displayToSemanticValue(final Object displayValue, final EObject editedObject) { + if (displayValue instanceof Profile) { + return ((Profile) displayValue).getURI(); + } + // required to avoid to lost the value when we can't resolve it + return displayValue; + } +}
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/converters/StereotypeDisplayConverter.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/converters/StereotypeDisplayConverter.java new file mode 100755 index 00000000000..10ebf1cd299 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/converters/StereotypeDisplayConverter.java @@ -0,0 +1,64 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.converters; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.emf.ui.converters.IDisplayConverter; +import org.eclipse.papyrus.uml.expressions.edit.internal.utils.ProfileUtils; +import org.eclipse.uml2.uml.Stereotype; + +/** + * This converter is used to convert a Stereotype into String (using its qualified name) and vice versa + */ +public class StereotypeDisplayConverter implements IDisplayConverter { + + /** + * + * @see org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.converters.IDisplayConverter#semanticToDisplayValue(java.lang.Object, org.eclipse.emf.ecore.EObject) + * + * @param canonicalValue + * @param editedObject + * @return + */ + @Override + public Object semanticToDisplayValue(final Object canonicalValue, final EObject editedObject) { + if (canonicalValue instanceof String && ((String) canonicalValue).length() > 0) { + final String stereotypeQualifiedName = (String) canonicalValue; + final Stereotype ste = ProfileUtils.findStereotype(editedObject, stereotypeQualifiedName); + if (null != ste) { + return ste; + } + } + // required to avoid to lost the value when we can't resolve it + return canonicalValue; + } + + /** + * @see org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.converters.IDisplayConverter#displayToSemanticValue(java.lang.Object) + * + * @param displayValue + * @return + */ + @Override + public Object displayToSemanticValue(final Object displayValue, final EObject editedObject) { + if (displayValue instanceof Stereotype) { + return ((Stereotype) displayValue).getQualifiedName(); + } + // required to avoid to lost the value when we can't resolve it + return displayValue; + } + +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/converters/StereotypePropertyDisplayConverter.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/converters/StereotypePropertyDisplayConverter.java new file mode 100755 index 00000000000..4922fd7c675 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/converters/StereotypePropertyDisplayConverter.java @@ -0,0 +1,76 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.converters; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.papyrus.emf.ui.converters.IDisplayConverter; +import org.eclipse.papyrus.infra.emf.expressions.IExpression; +import org.eclipse.papyrus.uml.expressions.edit.internal.utils.ProfileUtils; +import org.eclipse.uml2.uml.Property; +import org.eclipse.uml2.uml.Stereotype; + +/** + * This converter is used to convert a Stereotype Property into String (using its name) and vice versa + */ +public class StereotypePropertyDisplayConverter implements IDisplayConverter { + + /** + * + * @see org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.converters.IDisplayConverter#semanticToDisplayValue(java.lang.Object, org.eclipse.emf.ecore.EObject) + * + * @param canonicalValue + * @param editedObject + * @return + */ + @Override + public Object semanticToDisplayValue(final Object canonicalValue, final EObject editedObject) { + if (canonicalValue instanceof String && ((String) canonicalValue).length() > 0) { + if (editedObject instanceof IExpression<?, ?>) { + final IExpression<?, ?> exp = (IExpression<?, ?>) editedObject; + // there is not yet common class between Expression with the field stereotypeQualifiedName + final EStructuralFeature f = exp.eClass().getEStructuralFeature("stereotypeQualifiedName"); + + if (null != f && f instanceof EAttribute && false == f.isMany()) { + final Object value = exp.eGet(f); + if (value instanceof String) { + final Stereotype foundStereotype = ProfileUtils.findStereotype(exp, (String) value); + if (null != foundStereotype) { + return foundStereotype.getAttribute((String) canonicalValue, null); + } + } + } + } + } + return null; + } + + /** + * @see org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.converters.IDisplayConverter#displayToSemanticValue(java.lang.Object) + * + * @param displayValue + * @return + */ + @Override + public Object displayToSemanticValue(final Object displayValue, final EObject editedObject) { + if (displayValue instanceof Property) { + return ((Property) displayValue).getName(); + } + return ""; //$NON-NLS-1$ + } + +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/editors/factory/SingleProfileURIEditorFactory.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/editors/factory/SingleProfileURIEditorFactory.java new file mode 100755 index 00000000000..5d25d8edc1b --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/editors/factory/SingleProfileURIEditorFactory.java @@ -0,0 +1,80 @@ +/***************************************************************************** + * 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 + * http://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * CEA LIST - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.uml.expressions.edit.internal.editors.factory; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.papyrus.emf.ui.editor.factories.CustomExtendedDialogCellEditor; +import org.eclipse.papyrus.uml.expressions.edit.internal.converters.ProfileURIDisplayConverter; +import org.eclipse.papyrus.uml.expressions.edit.internal.messages.Messages; +import org.eclipse.papyrus.uml.expressions.edit.internal.providers.ProfileTreeContentProvider; +import org.eclipse.papyrus.uml.expressions.edit.internal.providers.UMLProfileURILabelProvider; +import org.eclipse.papyrus.uml.expressions.edit.internal.sections.duplicated.AbstractUMLElementDialogEditorFactory; +import org.eclipse.papyrus.uml.expressions.edit.internal.validators.SingleRootProfileValidator; +import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; + +/** + * EditorFactory for ProfileURI field + * + */ +public class SingleProfileURIEditorFactory extends AbstractUMLElementDialogEditorFactory { + + /** + * The URI of this editor + */ + private static final URI SELF_URI = URI.createURI("http://www.eclipse.org/papyrus/umlExpressions/StereotypeExpression/ProfileURI"); //$NON-NLS-1$ + + /** + * + * Constructor. + * + * @param feature + * the edited feature + */ + public SingleProfileURIEditorFactory() { + super(SELF_URI, UMLExpressionsPackage.eINSTANCE.getAbstractStereotypeExpression_ProfileURI()); + } + + + /** + * @see org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.editors.factories.AbstractEStructuralFeatureDialogEditorFactory#configureCellEditor(Object, + * org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.editors.CustomExtendedDialogCellEditor) + * + * @param editedObject + * @param cellEditor + */ + @Override + protected void configureCellEditor(final Object editedObject, final CustomExtendedDialogCellEditor cellEditor) { + super.configureCellEditor(editedObject, cellEditor); + cellEditor.setDialogMessage(Messages.SingleProfileURIEditorFactory_SelectARootProfileURI); + cellEditor.setContentProvider(new ProfileTreeContentProvider()); + cellEditor.setDisplayConverter(new ProfileURIDisplayConverter()); + cellEditor.setSelectionStatusValidator(new SingleRootProfileValidator()); + } + + /** + * @see org.eclipse.papyrus.uml.expressions.edit.internal.sections.duplicated.AbstractUMLElementDialogEditorFactory#getOrCreateLabelProvider() + * + * @return + */ + @Override + public ILabelProvider getOrCreateLabelProvider() { + if (null == this.labelProvider) { + this.labelProvider = new UMLProfileURILabelProvider(); + } + return this.labelProvider; + } +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/editors/factory/SingleStereotypeAttributeEditorFactory.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/editors/factory/SingleStereotypeAttributeEditorFactory.java new file mode 100755 index 00000000000..4ffd860cc31 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/editors/factory/SingleStereotypeAttributeEditorFactory.java @@ -0,0 +1,61 @@ +/***************************************************************************** + * 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 + * http://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * CEA LIST - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.uml.expressions.edit.internal.editors.factory; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.papyrus.emf.ui.editor.factories.CustomExtendedDialogCellEditor; +import org.eclipse.papyrus.uml.expressions.edit.internal.converters.StereotypePropertyDisplayConverter; +import org.eclipse.papyrus.uml.expressions.edit.internal.messages.Messages; +import org.eclipse.papyrus.uml.expressions.edit.internal.providers.StereotypePropertyTreeContentProvider; +import org.eclipse.papyrus.uml.expressions.edit.internal.sections.duplicated.AbstractUMLElementDialogEditorFactory; +import org.eclipse.papyrus.uml.expressions.edit.internal.validators.SinglePropertyAttributeValidator; +import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; + +/** + * EditorFactory for Stereotype Property typed with a PrimitiveType + */ +public class SingleStereotypeAttributeEditorFactory extends AbstractUMLElementDialogEditorFactory { + + /** + * The URI of this editor + */ + private static final URI SELF_URI = URI.createURI("http://www.eclipse.org/papyrus/umlExpressions/StereotypeAttributeEqualityExpression/AttributeName"); //$NON-NLS-1$ + + /** + * + * Constructor. + * + */ + public SingleStereotypeAttributeEditorFactory() { + super(SELF_URI, UMLExpressionsPackage.eINSTANCE.getSingleStereotypeAttributeEqualityExpression_PropertyName()); + } + + /** + * @see org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.editors.factories.AbstractEStructuralFeatureDialogEditorFactory#configureCellEditor(Object, + * org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.editors.CustomExtendedDialogCellEditor) + * + * @param editedObject + * @param cellEditor + */ + @Override + protected void configureCellEditor(final Object editedObject, final CustomExtendedDialogCellEditor cellEditor) { + super.configureCellEditor(editedObject, cellEditor); + cellEditor.setDialogMessage(Messages.SingleStereotypeAttributeEditorFactory_SelectAStereotypePropertyTypedWithAPrimitiveType); + cellEditor.setContentProvider(new StereotypePropertyTreeContentProvider()); + cellEditor.setDisplayConverter(new StereotypePropertyDisplayConverter()); + cellEditor.setSelectionStatusValidator(new SinglePropertyAttributeValidator()); + } +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/editors/factory/SingleStereotypeQualifiedNameEditorFactory.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/editors/factory/SingleStereotypeQualifiedNameEditorFactory.java new file mode 100755 index 00000000000..16098bf010e --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/editors/factory/SingleStereotypeQualifiedNameEditorFactory.java @@ -0,0 +1,64 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.editors.factory; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.papyrus.emf.ui.editor.factories.CustomExtendedDialogCellEditor; +import org.eclipse.papyrus.uml.expressions.edit.internal.converters.StereotypeDisplayConverter; +import org.eclipse.papyrus.uml.expressions.edit.internal.providers.StereotypeTreeContentProvider; +import org.eclipse.papyrus.uml.expressions.edit.internal.sections.duplicated.AbstractUMLElementDialogEditorFactory; +import org.eclipse.papyrus.uml.expressions.edit.internal.validators.SingleStereotypeValidator; +import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; + +/** + * EditorFactory to edit a Stereotype qualified name + */ +public class SingleStereotypeQualifiedNameEditorFactory extends AbstractUMLElementDialogEditorFactory { + + + /** + * The URI of this editor + */ + private static final URI SELF_URI = URI.createURI("http://www.eclipse.org/papyrus/umlExpressions/StereotypeExpression/StereotypeQualifiedName"); //$NON-NLS-1$ + + + /** + * Constructor. + * + * @param propertyEditorFactoryURI + * @param editedFeature + */ + public SingleStereotypeQualifiedNameEditorFactory() { + super(SELF_URI, UMLExpressionsPackage.eINSTANCE.getAbstractStereotypeExpression_StereotypeQualifiedName()); + } + + + /** + * @see org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.editors.factories.AbstractEStructuralFeatureDialogEditorFactory#configureCellEditor(Object, + * org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.editors.CustomExtendedDialogCellEditor) + * + * @param editedObject + * @param cellEditor + */ + @Override + protected void configureCellEditor(final Object editedObject, final CustomExtendedDialogCellEditor cellEditor) { + super.configureCellEditor(editedObject, cellEditor); + cellEditor.setDialogMessage("Select one Stereotype"); + cellEditor.setContentProvider(new StereotypeTreeContentProvider()); + cellEditor.setDisplayConverter(new StereotypeDisplayConverter()); + cellEditor.setSelectionStatusValidator(new SingleStereotypeValidator()); + } +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/editors/factory/SingleUMLEClassEditorFactory.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/editors/factory/SingleUMLEClassEditorFactory.java new file mode 100755 index 00000000000..ee2ee0b9783 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/editors/factory/SingleUMLEClassEditorFactory.java @@ -0,0 +1,77 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.editors.factory; + +import java.util.ArrayList; +import java.util.Collection; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.papyrus.emf.ui.editor.factories.AbstractEcoreEReferenceDialogEditorFactory; +import org.eclipse.papyrus.emf.ui.editor.factories.CustomExtendedDialogCellEditor; +import org.eclipse.papyrus.emf.ui.validators.SingleEClassValidator; +import org.eclipse.papyrus.uml.expressions.edit.internal.providers.EClassTreeContentProvider; +import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; +import org.eclipse.uml2.uml.UMLFactory; + +/** + * EditorFactory to select a UMLEClass + */ +public class SingleUMLEClassEditorFactory extends AbstractEcoreEReferenceDialogEditorFactory { + + /** + * This editor is registered with this URI with the extension point org.eclipse.emf.edit.propertyEditorFactories. + * This editor is also registered with this URI in an EAnnotation in the ecore model + */ + private static final URI SELF_URI = URI.createURI("http://www.eclipse.org/papyrus/umlExpressions/UMLEClassExpression/UMLEClass"); //$NON-NLS-1$ + + /** + * Constructor. + * + * @param propertyEditorFactoryURI + */ + public SingleUMLEClassEditorFactory() { + super(SELF_URI, UMLExpressionsPackage.eINSTANCE.getAbstractUMLEClassExpression_UmlEClass()); + } + + + /** + * @param editedObject + * @param cellEditor + * @see org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.editors.factories.AbstractEStructuralFeatureDialogEditorFactory#configureCellEditor(Object, + * org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.editors.factories.CustomExtendedDialogCellEditor) + */ + @Override + protected void configureCellEditor(final Object editedObject, final CustomExtendedDialogCellEditor cellEditor) { + super.configureCellEditor(editedObject, cellEditor); + cellEditor.setContentProvider(new EClassTreeContentProvider()); + cellEditor.setSelectionStatusValidator(new SingleEClassValidator()); + } + + /** + * @see org.eclipse.papyrus.emf.ui.editor.factories.AbstractEcoreEReferenceDialogEditorFactory#getEditedMetamodelEPackage(org.eclipse.emf.ecore.EObject) + * + * @param editedObject + * @return + */ + @Override + protected Collection<EPackage> getEditedMetamodelEPackage(final EObject editedObject) { + final Collection<EPackage> packages = new ArrayList<>(); + packages.add(UMLFactory.eINSTANCE.getEPackage()); + return packages; + } +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/messages/Messages.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/messages/Messages.java new file mode 100755 index 00000000000..b45989745e6 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/messages/Messages.java @@ -0,0 +1,38 @@ +/***************************************************************************** + * 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 + * http://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * CEA LIST - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.uml.expressions.edit.internal.messages; + +import org.eclipse.osgi.util.NLS; + +/** + * @author VL222926 + * + */ +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.expressions.edit.internal.messages.messages"; //$NON-NLS-1$ + public static String SingleProfileURIEditorFactory_SelectARootProfileURI; + public static String SinglePropertyAttributeValidator_SelectOnePropertyTypeWithAPrimitiveType; + public static String SingleRootProfileValidator_SelectARootProfileWithAURI; + public static String SingleStereotypeAttributeEditorFactory_SelectAStereotypePropertyTypedWithAPrimitiveType; + public static String SingleStereotypeValidator_SelectAStereotype; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/messages/messages.properties b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/messages/messages.properties new file mode 100755 index 00000000000..3e3bbce0f43 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/messages/messages.properties @@ -0,0 +1,5 @@ +SingleProfileURIEditorFactory_SelectARootProfileURI=Select a root Profile with a URI +SinglePropertyAttributeValidator_SelectOnePropertyTypeWithAPrimitiveType=You must select one Property typed with a PrimitiveType +SingleRootProfileValidator_SelectARootProfileWithAURI=You must select one root Profile with a defined URI +SingleStereotypeAttributeEditorFactory_SelectAStereotypePropertyTypedWithAPrimitiveType=Select a Stereotype Property typed with a PrimitiveType +SingleStereotypeValidator_SelectAStereotype=You must select one Stereotype diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/EClassTreeContentProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/EClassTreeContentProvider.java new file mode 100755 index 00000000000..bb590227272 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/EClassTreeContentProvider.java @@ -0,0 +1,143 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.providers; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EClassifier; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.jface.viewers.ITreeContentProvider; + +/** + * This contents provider allows to navigate until to find EClass owned by EPackage + * Only EClass and EPackage are displayed + */ +public class EClassTreeContentProvider implements ITreeContentProvider { + + /** + * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object) + * + * @param inputElement + * @return + */ + @Override + public Object[] getElements(final Object inputElement) { + if (inputElement instanceof Collection<?>) { + return ((Collection<?>) inputElement).toArray(); + } + if (inputElement instanceof Object[]) { + return (Object[]) inputElement; + } + return new Object[0]; + } + + /** + * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) + * + * @param parentElement + * @return + */ + @Override + public Object[] getChildren(final Object parentElement) { + if (parentElement instanceof EPackage) { + final Collection<EObject> returnedValues = new ArrayList<EObject>(); + final EPackage ePackage = (EPackage) parentElement; + for (final EPackage current : ePackage.getESubpackages()) { + if (isValidValue(current)) { + returnedValues.add(current); + } + } + for (final EClassifier current : ePackage.getEClassifiers()) { + if (isValidValue(current)) { + returnedValues.add(current); + } + } + return returnedValues.toArray(); + } + return new Object[0]; + } + + /** + * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) + * + * @param element + * @return + */ + @Override + public Object getParent(final Object element) { + if (element instanceof EObject) { + return ((EObject) element).eContainer(); + } + return null; + } + + /** + * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) + * + * @param element + * @return + */ + @Override + public boolean hasChildren(final Object element) { + if (element instanceof EClass) { + return false; + } + return isValidValue(element); + } + + + /** + * + * @param ePackage + * an EPackage + * @return + * <code>true</code> if there is an {@link EClass} in the contents/subcontents of the EPackage + */ + protected final boolean hasEClassInHierarchy(final EPackage ePackage) { + final Iterator<EClassifier> eClassIter = ePackage.getEClassifiers().iterator(); + boolean isValidValue = false; + while (eClassIter.hasNext() && false == isValidValue) { + isValidValue = isValidValue(eClassIter.next()); + } + + final Iterator<EPackage> packIter = ePackage.getESubpackages().iterator(); + while (packIter.hasNext() && false == isValidValue) { + isValidValue = hasEClassInHierarchy(packIter.next()); + } + return isValidValue; + } + + + /** + * @see org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.providers.IHierarchicContentProvider#isValidValue(java.lang.Object) + * + * @param element + * @return + */ + public boolean isValidValue(Object element) { + if (element instanceof EClass) { + return true; + } + if (element instanceof EPackage) { + return hasEClassInHierarchy((EPackage) element); + } + return false; + } +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/ProfileTreeContentProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/ProfileTreeContentProvider.java new file mode 100755 index 00000000000..245952c20af --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/ProfileTreeContentProvider.java @@ -0,0 +1,141 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.providers; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.uml2.uml.Element; +import org.eclipse.uml2.uml.NamedElement; +import org.eclipse.uml2.uml.Namespace; +import org.eclipse.uml2.uml.Package; +import org.eclipse.uml2.uml.Profile; +import org.eclipse.uml2.uml.Stereotype; + +/** + * This contents provider allows to navigate until to find Profiles + */ +public class ProfileTreeContentProvider implements ITreeContentProvider { + + /** + * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object) + * + * @param inputElement + * @return + */ + @Override + public Object[] getElements(final Object inputElement) { + if (inputElement instanceof Collection<?>) { + return ((Collection<?>) inputElement).toArray(); + } + if (inputElement instanceof Object[]) { + return (Object[]) inputElement; + } + return new Object[0]; + } + + /** + * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) + * + * @param parentElement + * @return + */ + @Override + public Object[] getChildren(final Object parentElement) { + if (parentElement instanceof Namespace) { + final Iterator<NamedElement> namedElementIter = ((Namespace) parentElement).getOwnedMembers().iterator(); + final Collection<Element> children = new ArrayList<>(); + while (namedElementIter.hasNext()) { + final NamedElement current = namedElementIter.next(); + if (isValid(current)) { + children.add(current); + } + } + return children.toArray(); + } + return new Object[0]; + } + + /** + * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) + * + * @param element + * @return + */ + @Override + public Object getParent(final Object element) { + if (element instanceof EObject) { + return ((EObject) element).eContainer(); + } + return null; + } + + /** + * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) + * + * @param element + * @return + */ + @Override + public boolean hasChildren(final Object element) { + if (element instanceof Stereotype) { + return false; + } + if (element instanceof EObject) { + return isValid((EObject) element); + } + return false; + } + + /** + * + * @param pack + * a UML Package + * @return + * <code>true</code> if there is a {@link Stereotype} in the contents/subcontents of the Package + */ + protected final boolean hasProfileInHierarchy(final Package pack) { + final Iterator<NamedElement> namedElementIter = pack.getOwnedMembers().iterator(); + while (namedElementIter.hasNext()) { + final NamedElement current = namedElementIter.next(); + if (isValid(current)) { + return true; + } + + } + return false; + } + + /** + * + * @param eobject + * an eobject + * @return + * <code>true</code> if the element has an interesting element to display + */ + protected boolean isValid(final EObject eobject) { + if (eobject instanceof Profile) { + return true; + } + if (eobject instanceof Package) { + return (hasProfileInHierarchy((Package) eobject)); + } + return false; + } +}
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/StereotypePropertyTreeContentProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/StereotypePropertyTreeContentProvider.java new file mode 100755 index 00000000000..af1d80d0fa3 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/StereotypePropertyTreeContentProvider.java @@ -0,0 +1,102 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.providers; + +import java.util.Iterator; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.uml2.uml.NamedElement; +import org.eclipse.uml2.uml.Package; +import org.eclipse.uml2.uml.Property; +import org.eclipse.uml2.uml.Stereotype; + +/** + * This contents provider allows to navigate until to find Properties (and inherited Properties) owned by a Stereotypes + */ +public class StereotypePropertyTreeContentProvider extends StereotypeTreeContentProvider { + + /** + * @see org.eclipse.papyrus.uml.expressions.edit.internal.providers.model2doc.uml.documentstructuretemplate.edit.internal.providers.StereotypeTreeContentProvider#hasChildren(java.lang.Object) + * + * @param element + * @return + */ + @Override + public boolean hasChildren(Object element) { + if (element instanceof Property) { + return false; + } + if (element instanceof Stereotype) { + return hasPropertyInHierarchy((Stereotype) element); + } + return super.hasChildren(element); + } + + /** + * + * @param eClass + * @return + * <code>true</code> if the EClass contains EReference + */ + protected final boolean hasPropertyInHierarchy(final Stereotype stereotype) { + final Iterator<NamedElement> namedElementIter = stereotype.getMembers().iterator(); + while (namedElementIter.hasNext()) { + final NamedElement current = namedElementIter.next(); + if (isValid(current)) { + return true; + } + } + return false; + } + + /** + * + * @param ePackage + * @return + * <code>true</code> if the EPackage contains EClass contaning EReference + */ + protected final boolean hasPropertyInHierarchy(final Package profile) { + final Iterator<NamedElement> namedElementIter = profile.getMembers().iterator(); + while (namedElementIter.hasNext()) { + final NamedElement current = namedElementIter.next(); + if (isValid(current)) { + return true; + } + } + return false; + } + + /** + * @see org.eclipse.papyrus.uml.expressions.edit.internal.providers.model2doc.uml.documentstructuretemplate.edit.internal.providers.StereotypeTreeContentProvider#isValid(org.eclipse.emf.ecore.EObject) + * + * @param eobject + * @return + */ + @Override + protected boolean isValid(final EObject eobject) { + if (eobject instanceof Property) { + return true; + } + if (eobject instanceof Stereotype) { + return hasPropertyInHierarchy((Stereotype) eobject); + } + if (eobject instanceof Package) { + return hasPropertyInHierarchy((Package) eobject); + } + return false; + } + +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/StereotypeTreeContentProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/StereotypeTreeContentProvider.java new file mode 100755 index 00000000000..5233847b259 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/StereotypeTreeContentProvider.java @@ -0,0 +1,140 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.providers; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.uml2.uml.Element; +import org.eclipse.uml2.uml.NamedElement; +import org.eclipse.uml2.uml.Namespace; +import org.eclipse.uml2.uml.Package; +import org.eclipse.uml2.uml.Stereotype; + +/** + * This contents provider allows to navigate until to find Stereotype owned by Profile or Package + */ +public class StereotypeTreeContentProvider implements ITreeContentProvider { + + /** + * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object) + * + * @param inputElement + * @return + */ + @Override + public Object[] getElements(final Object inputElement) { + if (inputElement instanceof Collection<?>) { + return ((Collection<?>) inputElement).toArray(); + } + if (inputElement instanceof Object[]) { + return (Object[]) inputElement; + } + return new Object[0]; + } + + /** + * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) + * + * @param parentElement + * @return + */ + @Override + public Object[] getChildren(final Object parentElement) { + if (parentElement instanceof Namespace) { + final Iterator<NamedElement> namedElementIter = ((Namespace) parentElement).getOwnedMembers().iterator(); + final Collection<Element> children = new ArrayList<Element>(); + while (namedElementIter.hasNext()) { + final NamedElement current = namedElementIter.next(); + if (isValid(current)) { + children.add(current); + } + } + return children.toArray(); + } + return new Object[0]; + } + + /** + * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) + * + * @param element + * @return + */ + @Override + public Object getParent(final Object element) { + if (element instanceof EObject) { + return ((EObject) element).eContainer(); + } + return null; + } + + /** + * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) + * + * @param element + * @return + */ + @Override + public boolean hasChildren(final Object element) { + if (element instanceof Stereotype) { + return false; + } + if (element instanceof EObject) { + return isValid((EObject) element); + } + return false; + } + + /** + * + * @param pack + * a UML Package + * @return + * <code>true</code> if there is a {@link Stereotype} in the contents/subcontents of the Package + */ + protected final boolean hasStereotypeInHierarchy(final Package pack) { + final Iterator<NamedElement> namedElementIter = pack.getOwnedMembers().iterator(); + while (namedElementIter.hasNext()) { + final NamedElement current = namedElementIter.next(); + if (isValid(current)) { + return true; + } + + } + return false; + } + + /** + * + * @param eobject + * an eobject + * @return + * <code>true</code> if the element has an interesting element to display + */ + protected boolean isValid(final EObject eobject) { + if (eobject instanceof Stereotype) { + return true; + } + if (eobject instanceof Package) { + return (hasStereotypeInHierarchy((Package) eobject)); + } + return false; + } +}
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/UMLLabelProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/UMLLabelProvider.java new file mode 100755 index 00000000000..232ca355ad1 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/UMLLabelProvider.java @@ -0,0 +1,153 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.providers; + +import java.util.ArrayList; +import java.util.Collection; + +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.ecore.ENamedElement; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.edit.provider.ComposedAdapterFactory.Descriptor; +import org.eclipse.emf.edit.provider.ComposedAdapterFactory.Descriptor.Registry; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ILabelProviderListener; +import org.eclipse.swt.graphics.Image; +import org.eclipse.uml2.uml.NamedElement; + +/** + * A label provider used to display Ecore name + */ +public class UMLLabelProvider implements ILabelProvider { + + /** + * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) + * + * @param listener + */ + @Override + public void addListener(ILabelProviderListener listener) { + // nothing to do + } + + /** + * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() + * + */ + @Override + public void dispose() { + // nothing to do + } + + /** + * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String) + * + * @param element + * @param property + * @return + */ + @Override + public boolean isLabelProperty(Object element, String property) { + // nothing to do + return false; + } + + /** + * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) + * + * @param listener + */ + @Override + public void removeListener(ILabelProviderListener listener) { + // nothing to do + } + + /** + * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) + * + * @param element + * @return + */ + @Override + public Image getImage(Object element) { + if (element instanceof EObject) { + final IItemLabelProvider lp = getSubLabelProvider((EObject) element); + if (null != lp) { + Object im = lp.getImage(element); + im = ExtendedImageRegistry.INSTANCE.getImage(im); + if (im instanceof Image) { + return (Image) im; + } + } + } + return null; + } + + /** + * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) + * + * @param element + * @return + */ + @Override + public String getText(Object element) { + if (element instanceof String) { + return (String) element; + } + if (element instanceof NamedElement) { + return ((NamedElement) element).getName(); + } + if (element instanceof EPackage) { + final EPackage pack = (EPackage) element; + final StringBuilder builder = new StringBuilder(); + builder.append(pack.getName()); + builder.append(" - "); //$NON-NLS-1$ + builder.append(pack.getNsURI()); + return builder.toString(); + } + if (element instanceof ENamedElement) { + return ((ENamedElement) element).getName(); + } + return ""; //$NON-NLS-1$ + } + + /** + * + * @param eobject + * an eobejct + * @return + * the IITemLabelProvider declared for this EObject + */ + private IItemLabelProvider getSubLabelProvider(final EObject eobject) { + final Registry registry = ComposedAdapterFactory.Descriptor.Registry.INSTANCE; + final Collection<Object> types = new ArrayList<Object>(); + types.add(eobject.eClass().getEPackage()); + types.add(IItemLabelProvider.class); + final Descriptor descriptor = registry.getDescriptor(types); + final AdapterFactory adapterFactory = descriptor.createAdapterFactory(); + final Adapter adapt = adapterFactory.adapt(eobject, IItemLabelProvider.class); + if (adapt instanceof IItemLabelProvider) { + return (IItemLabelProvider) adapt; + } + return null; + } + +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/UMLProfileURILabelProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/UMLProfileURILabelProvider.java new file mode 100755 index 00000000000..470ed92a479 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/providers/UMLProfileURILabelProvider.java @@ -0,0 +1,46 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.providers; + +import org.eclipse.uml2.uml.Profile; + +/** + * This label provides a label for UML Element (like {@link UMLLabelProvider} + * We just customized the label for Profile where we displayed its URI too (when it exists) + * + */ +public class UMLProfileURILabelProvider extends UMLLabelProvider { + + /** + * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) + * + * @param element + * @return + */ + @Override + public String getText(Object element) { + final String text = super.getText(element); + if (null != text && element instanceof Profile) { + final StringBuilder builder = new StringBuilder(text); + builder.append(" - "); //$NON-NLS-1$ + final String profileURI = ((Profile) element).getURI(); + builder.append(null == profileURI || profileURI.isEmpty() ? "No URI" : profileURI); //$NON-NLS-1$ + return builder.toString(); + } + return text; + } + +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/sections/UMLExpressionPropertySection.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/sections/UMLExpressionPropertySection.java new file mode 100755 index 00000000000..5bb37fe68d9 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/sections/UMLExpressionPropertySection.java @@ -0,0 +1,40 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.sections; + +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.papyrus.emf.ui.properties.AbstractEObjectAdvancedPropertySection; +import org.eclipse.ui.views.properties.IPropertySource; + +/** + * PropertySection for UML Expression + * + */ +public class UMLExpressionPropertySection extends AbstractEObjectAdvancedPropertySection { + + /** + * + * @see org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.properties.sections.AbstractEObjectAdvancedPropertySection#createPropertySource(java.lang.Object, org.eclipse.emf.edit.provider.IItemPropertySource) + * + * @param object + * @param itemPropertySource + * @return + */ + @Override + public IPropertySource createPropertySource(final Object object, final IItemPropertySource itemPropertySource) { + return new UMLExpressionPropertySource(object, itemPropertySource); + } +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/sections/UMLExpressionPropertySource.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/sections/UMLExpressionPropertySource.java new file mode 100755 index 00000000000..e2fdf56d044 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/sections/UMLExpressionPropertySource.java @@ -0,0 +1,79 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.sections; + +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +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.uml.expressions.edit.internal.editors.factory.SingleProfileURIEditorFactory; +import org.eclipse.papyrus.uml.expressions.edit.internal.editors.factory.SingleStereotypeAttributeEditorFactory; +import org.eclipse.papyrus.uml.expressions.edit.internal.editors.factory.SingleStereotypeQualifiedNameEditorFactory; +import org.eclipse.papyrus.uml.expressions.edit.internal.editors.factory.SingleUMLEClassEditorFactory; +import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; +import org.eclipse.ui.views.properties.IPropertyDescriptor; + +/** + * The {@link PropertySource} used to provide a better edition way for some properties of the UMLExpression metamodel + */ +public class UMLExpressionPropertySource extends PropertySource { + + /** + * Constructor. + * + * @param object + * @param itemPropertySource + */ + public UMLExpressionPropertySource(final Object object, final IItemPropertySource itemPropertySource) { + super(object, itemPropertySource); + } + + /** + * @see org.eclipse.emf.edit.ui.provider.PropertySource#createPropertyDescriptor(org.eclipse.emf.edit.provider.IItemPropertyDescriptor) + * + * @param itemPropertyDescriptor + * @return + */ + @Override + protected IPropertyDescriptor createPropertyDescriptor(final IItemPropertyDescriptor itemPropertyDescriptor) { + final EStructuralFeature f = (EStructuralFeature) itemPropertyDescriptor.getFeature(this.object); + AbstractEStructuralFeatureDialogEditorFactory editorFactory = null; + // stereotype qualified name + if (f == UMLExpressionsPackage.eINSTANCE.getAbstractStereotypeExpression_StereotypeQualifiedName()) { + editorFactory = new SingleStereotypeQualifiedNameEditorFactory(); + + // profile URI + } else if (f == UMLExpressionsPackage.eINSTANCE.getAbstractStereotypeExpression_ProfileURI()) { + editorFactory = new SingleProfileURIEditorFactory(); + + // stereotype's property name + } else if (f == UMLExpressionsPackage.eINSTANCE.getSingleStereotypeAttributeEqualityExpression_PropertyName()) { + editorFactory = new SingleStereotypeAttributeEditorFactory(); + + // UMLEClass + } else if (f == UMLExpressionsPackage.eINSTANCE.getAbstractUMLEClassExpression_UmlEClass()) { + editorFactory = new SingleUMLEClassEditorFactory(); + } + + + if (null != editorFactory) { + return new CustomPropertyDescriptor(this.object, itemPropertyDescriptor, editorFactory); + } + return super.createPropertyDescriptor(itemPropertyDescriptor); + } +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/sections/UMLExpressionSectionFilter.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/sections/UMLExpressionSectionFilter.java new file mode 100755 index 00000000000..a193e747b8d --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/sections/UMLExpressionSectionFilter.java @@ -0,0 +1,47 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.sections; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.jface.viewers.IFilter; +import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; + +/** + * + * Filter to activate the EMF property view for UMLExpression + * + */ +public class UMLExpressionSectionFilter implements IFilter { + + /** + * + * @see org.eclipse.jface.viewers.IFilter#select(java.lang.Object) + * + * @param toTest + * @return + */ + @Override + public boolean select(final Object toTest) { + if (toTest instanceof EObject) { + final EObject eobject = (EObject) toTest; + final EPackage ePackage = eobject.eClass().getEPackage(); + return ePackage == UMLExpressionsPackage.eINSTANCE; + } + return false; + } + +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/sections/duplicated/AbstractUMLElementDialogEditorFactory.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/sections/duplicated/AbstractUMLElementDialogEditorFactory.java new file mode 100755 index 00000000000..65e72616eb7 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/sections/duplicated/AbstractUMLElementDialogEditorFactory.java @@ -0,0 +1,69 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.sections.duplicated; + +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.jface.viewers.ILabelProvider; +import org.eclipse.papyrus.emf.ui.editor.factories.AbstractEStructuralFeatureDialogEditorFactory; +import org.eclipse.papyrus.uml.expressions.edit.internal.providers.UMLLabelProvider; +import org.eclipse.papyrus.uml.expressions.edit.internal.utils.ProfileUtils; + +/** + * Abstract dialog editor factory used to select UML Element from a Profile + */ +public abstract class AbstractUMLElementDialogEditorFactory extends AbstractEStructuralFeatureDialogEditorFactory { + + /** + * Constructor. + * + * @param propertyEditorFactoryURI + * @param editedFeature + */ + public AbstractUMLElementDialogEditorFactory(final URI propertyEditorFactoryURI, final EStructuralFeature editedFeature) { + super(propertyEditorFactoryURI, editedFeature); + } + + /** + * @see org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit.editors.factories.AbstractEStructuralFeatureDialogEditorFactory#getDialogInput(org.eclipse.emf.ecore.EObject) + * + * @param editedElement + * @return + */ + @Override + protected Collection<?> getDialogInput(final EObject editedElement) { + return ProfileUtils.findAttachedRootProfiles(editedElement); + } + + /** + * Creates a new label provider when required, and return the previously created one if it exits + * + * @return + * the label provider to use in the dialog + */ + @Override + public ILabelProvider getOrCreateLabelProvider() { + if (this.labelProvider == null) { + this.labelProvider = new UMLLabelProvider(); + } + return this.labelProvider; + } + + +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/utils/PackageUtils.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/utils/PackageUtils.java new file mode 100755 index 00000000000..85cecd87906 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/utils/PackageUtils.java @@ -0,0 +1,82 @@ +/***************************************************************************** + * 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 + * http://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * CEA LIST - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.uml.expressions.edit.internal.utils; + +import java.util.Iterator; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.uml2.uml.Package; + +/** + * Some utils method to manipulate UML Package + * + */ +public class PackageUtils { + + /** + * + * @param package_ + * a package + * @param packageURI + * the expected package URI (can't be <code>null</code> of empty + * @param expectedPackageEClass + * the expected EClass (UMLPackage.eInstance.getPackage()/getModel()/getProfile() + * @return + * the found {@link Package} or null + */ + public static final Package findPackageFromURI(final Package package_, final String packageURI, final EClass expectedPackageEClass) { + if (null == packageURI || packageURI.isEmpty() || null == package_) { + return null; + } + if (packageURI.equals(package_.getURI()) + && (null == expectedPackageEClass || expectedPackageEClass == package_.eClass())) { + return package_; + } + final Iterator<Package> packIter = package_.getNestedPackages().iterator(); + Package foundPackage = null; + while (packIter.hasNext() && null == foundPackage) { + foundPackage = findPackageFromURI(packIter.next(), packageURI, expectedPackageEClass); + } + return foundPackage; + } + + /** + * + * @param <T> + * @param package_ + * a package + * @param packageURI + * the expected package URI (can't be <code>null</code> of empty + * @param expectedPackageEClass + * the expected type (Profile, Package or Model) + * @return + * the found {@link Package} or null + */ + public static final <T> T findPackageFromURI(final Package package_, final String packageURI, final Class<T> expectedType) { + if (null == packageURI || packageURI.isEmpty() || null == package_) { + return null; + } + if (packageURI.equals(package_.getURI()) && expectedType.isInstance(package_)) { + return expectedType.cast(package_); + } + final Iterator<Package> packIter = package_.getNestedPackages().iterator(); + T foundPackage = null; + while (packIter.hasNext() && null == foundPackage) { + foundPackage = findPackageFromURI(packIter.next(), packageURI, expectedType); + } + return foundPackage; + } +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/utils/ProfileUtils.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/utils/ProfileUtils.java new file mode 100755 index 00000000000..92c51f6a5d8 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/utils/ProfileUtils.java @@ -0,0 +1,149 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.utils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.Set; +import java.util.stream.Collectors; + +import org.eclipse.emf.common.util.TreeIterator; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.uml2.uml.NamedElement; +import org.eclipse.uml2.uml.Namespace; +import org.eclipse.uml2.uml.Profile; +import org.eclipse.uml2.uml.Property; +import org.eclipse.uml2.uml.Stereotype; + +/** + * Utility class for UML Profile, Stereotype, ... + */ +public class ProfileUtils { + + /** + * + * @param anEobject + * an eobject + * @return + * a collection of UML Profile accessible from the {@link ResourceSet} + */ + public static final Collection<Profile> findAttachedRootProfiles(final EObject anEobject) { + final Set<Profile> profiles = new HashSet<>(); + if (null != anEobject.eResource() && null != anEobject.eResource().getResourceSet()) { + // we cross the loaded resource to find EPackage in others resource + final ResourceSet set = anEobject.eResource().getResourceSet(); + final Iterator<Resource> iter = set.getResources().iterator(); + while (iter.hasNext()) { + final Resource res = iter.next(); + for (EObject eobject : res.getContents()) { + if (eobject instanceof Profile) { + profiles.add((Profile) eobject); + } + } + } + } + return profiles; + } + + /** + * + * @param editedObject + * the edited object (an element of the DocumentStructureTemplate metamodel (or from one of these extension) + * @param stereotypeQualifiedName + * a stereotype's qualified name + * @return + * the stereotype itself if we found it or <code>null</code> + */ + public static final Stereotype findStereotype(final EObject editedObject, final String stereotypeQualifiedName) { + final List<String> namespaces = Arrays.asList(stereotypeQualifiedName.split("::")); //$NON-NLS-1$ + final Collection<Profile> profiles = ProfileUtils.findAttachedRootProfiles(editedObject); + // we assume each name is unique for a given depth + final List<Profile> findProfilesByName = profiles.stream().filter(p -> p.getName().equals(namespaces.get(0))).collect(Collectors.toList()); + if (null != findProfilesByName && findProfilesByName.size() == 1) { + final Profile profile = findProfilesByName.get(0); + final ListIterator<String> iter = namespaces.listIterator(); + iter.next();// we bypass the first profile name + Namespace current = profile; + while (iter.hasNext()) { + final NamedElement namedElement = current.getMember(iter.next()); + if (namedElement instanceof Namespace) { + // it should always be true + current = (Namespace) namedElement; + } + } + // it is the stereotype + if (current instanceof Stereotype) { + return (Stereotype) current; + } + } + return null; + } + + + public static final Profile findProfile(final EObject editedObject, final String profileURI) { + if (null == profileURI || profileURI.isEmpty()) { + return null; + } + final Collection<Profile> profiles = ProfileUtils.findAttachedRootProfiles(editedObject); + final Iterator<Profile> iter = profiles.iterator(); + Profile foundProfile = null; + while (iter.hasNext() && null == foundProfile) { + foundProfile = PackageUtils.findPackageFromURI(iter.next(), profileURI, Profile.class); + } + return foundProfile; + } + + /** + * + * @param editedObject + * the edited object (an element of the DocumentStructureTemplate metamodel (or from one of these extension) + * @param propertyName + * a stereotype's property's name + * @return + * all matching found propertes + */ + public static final Collection<Property> findStereotypeProperty(final EObject editedEObject, final String propertyName) { + if (null == propertyName || propertyName.isEmpty()) { + return Collections.emptyList(); + } + final Collection<Property> properties = new ArrayList<>(); + final Collection<Profile> profiles = findAttachedRootProfiles(editedEObject); + final Iterator<Profile> profileIter = profiles.iterator(); + while (profileIter.hasNext()) { + final Profile current = profileIter.next(); + final TreeIterator<EObject> allContentsIterator = current.eAllContents(); + while (allContentsIterator.hasNext()) { + final EObject eobject = allContentsIterator.next(); + if (eobject instanceof Property && eobject.eContainer() instanceof Stereotype && propertyName.equals(((Property) eobject).getName())) { + properties.add((Property) eobject); + } + } + } + return properties; + } + + + + +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/validators/SinglePropertyAttributeValidator.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/validators/SinglePropertyAttributeValidator.java new file mode 100755 index 00000000000..75f6f606413 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/validators/SinglePropertyAttributeValidator.java @@ -0,0 +1,50 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.validators; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.papyrus.emf.ui.validators.AbstractSelectionStatusValidator; +import org.eclipse.papyrus.uml.expressions.edit.internal.messages.Messages; +import org.eclipse.uml2.uml.PrimitiveType; +import org.eclipse.uml2.uml.Property; + +/** + * Validator for Single Selection of property attribute + */ +public class SinglePropertyAttributeValidator extends AbstractSelectionStatusValidator { + + + /** + * @see org.eclipse.ui.dialogs.ISelectionStatusValidator#validate(java.lang.Object[]) + * + * @param selection + * @return + */ + @Override + public IStatus validate(Object[] selection) { + String errorMessage = ""; //$NON-NLS-1$ + if (selection.length <= 0) { + errorMessage = NO_SELECTION; + } else { + final Object firstSelection = selection[0]; + if (selection.length != 1 || false == firstSelection instanceof Property || (firstSelection instanceof Property && false == ((Property) firstSelection).getType() instanceof PrimitiveType)) { + errorMessage = Messages.SinglePropertyAttributeValidator_SelectOnePropertyTypeWithAPrimitiveType; + } + } + return buildIStatus(errorMessage); + } + +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/validators/SingleRootProfileValidator.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/validators/SingleRootProfileValidator.java new file mode 100755 index 00000000000..3e318195e6f --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/validators/SingleRootProfileValidator.java @@ -0,0 +1,56 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.validators; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.papyrus.emf.ui.validators.AbstractSelectionStatusValidator; +import org.eclipse.papyrus.uml.expressions.edit.internal.messages.Messages; +import org.eclipse.uml2.uml.Profile; + +/** + * Validator for Single Selection of property attribute + */ +public class SingleRootProfileValidator extends AbstractSelectionStatusValidator { + + + /** + * @see org.eclipse.ui.dialogs.ISelectionStatusValidator#validate(java.lang.Object[]) + * + * @param selection + * @return + */ + @Override + public IStatus validate(Object[] selection) { + String errorMessage = ""; //$NON-NLS-1$ + if (selection.length <= 0) { + errorMessage = NO_SELECTION; + } else { + final Object firstSelection = selection[0]; + final String mes = Messages.SingleRootProfileValidator_SelectARootProfileWithAURI; + if (selection.length != 1 || false == firstSelection instanceof Profile) { + errorMessage = mes; + } + if (selection.length == 1 && firstSelection instanceof Profile) { + final Profile p = (Profile) firstSelection; + if (p.eContainer() != null || p.getURI() == null || p.getURI().isEmpty()) { + errorMessage = mes; + } + } + } + return buildIStatus(errorMessage); + } + +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/validators/SingleStereotypeValidator.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/validators/SingleStereotypeValidator.java new file mode 100755 index 00000000000..6633ff5d3ce --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src/org/eclipse/papyrus/uml/expressions/edit/internal/validators/SingleStereotypeValidator.java @@ -0,0 +1,49 @@ +/***************************************************************************** + * 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 + * http://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.uml.expressions.edit.internal.validators; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.papyrus.emf.ui.validators.AbstractSelectionStatusValidator; +import org.eclipse.papyrus.uml.expressions.edit.internal.messages.Messages; +import org.eclipse.uml2.uml.Stereotype; + +/** + * Validator for Single Selection of Stereotype + */ +public class SingleStereotypeValidator extends AbstractSelectionStatusValidator { + + + /** + * @see org.eclipse.ui.dialogs.ISelectionStatusValidator#validate(java.lang.Object[]) + * + * @param selection + * @return + */ + @Override + public IStatus validate(Object[] selection) { + String errorMessage = ""; //$NON-NLS-1$ + if (selection.length <= 0) { + errorMessage = NO_SELECTION; + } else { + final Object firstSelection = selection[0]; + if (false == firstSelection instanceof Stereotype || selection.length != 1) { + errorMessage = Messages.SingleStereotypeValidator_SelectAStereotype; + } + } + return buildIStatus(errorMessage); + } + +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleAbstractStereotypeExpression.xwt b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleAbstractStereotypeExpression.xwt new file mode 100755 index 00000000000..e29bdbb8542 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleAbstractStereotypeExpression.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/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleAbstractUMLEClassExpression.xwt b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleAbstractUMLEClassExpression.xwt new file mode 100755 index 00000000000..e29bdbb8542 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleAbstractUMLEClassExpression.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/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleIsKindOfStereotypeExpression.xwt b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleIsKindOfStereotypeExpression.xwt index 37c82d514a4..e29bdbb8542 100644 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleIsKindOfStereotypeExpression.xwt +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleIsKindOfStereotypeExpression.xwt @@ -1,18 +1,9 @@ <?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: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> - <Composite.layout> - <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> - </Composite.layout> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsKindOfStereotypeExpression:stereotypeQualifiedName"></ppe:StringEditor> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsKindOfStereotypeExpression:profileURI"></ppe:StringEditor> - </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleIsTypeOfStereotypeExpression.xwt b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleIsTypeOfStereotypeExpression.xwt index 6d6b93775d2..e29bdbb8542 100644 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleIsTypeOfStereotypeExpression.xwt +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleIsTypeOfStereotypeExpression.xwt @@ -1,18 +1,9 @@ <?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: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> - <Composite.layout> - <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> - </Composite.layout> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsTypeOfStereotypeExpression:stereotypeQualifiedName"></ppe:StringEditor> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsTypeOfStereotypeExpression:profileURI"></ppe:StringEditor> - </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleSingleStereotypeAttributeEqualityExpression.xwt b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleSingleStereotypeAttributeEqualityExpression.xwt new file mode 100755 index 00000000000..e29bdbb8542 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleSingleStereotypeAttributeEqualityExpression.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/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleAbstractStereotypeExpression.xwt b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleAbstractStereotypeExpression.xwt new file mode 100755 index 00000000000..24c39397127 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleAbstractStereotypeExpression.xwt @@ -0,0 +1,21 @@ +<?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:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets" + 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> + <uml:StereotypeQualifyNamePropertyEditor + input="{Binding}" + property="umlexpressions:AbstractStereotypeExpression:stereotypeQualifiedName"></uml:StereotypeQualifyNamePropertyEditor> + <ppe:StringEditor input="{Binding}" + property="umlexpressions:AbstractStereotypeExpression:profileURI"></ppe:StringEditor> + </Composite> +</Composite>
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleAbstractUMLEClassExpression.xwt b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleAbstractUMLEClassExpression.xwt new file mode 100755 index 00000000000..19ce7b344f2 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleAbstractUMLEClassExpression.xwt @@ -0,0 +1,17 @@ +<?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:ReferenceDialog input="{Binding}" + property="umlexpressions:AbstractUMLEClassExpression:umlEClass"></ppe:ReferenceDialog> + </Composite> +</Composite>
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleHasAppliedStereotypesExpression.xwt b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleHasAppliedStereotypesExpression.xwt index 7782ea8a652..e29bdbb8542 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleHasAppliedStereotypesExpression.xwt +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleHasAppliedStereotypesExpression.xwt @@ -1,18 +1,9 @@ <?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: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> - <Composite.layout> - <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> - </Composite.layout> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:HasAppliedStereotypesExpression:name"></ppe:StringEditor> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:HasAppliedStereotypesExpression:description"></ppe:StringEditor> - </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsKindOfExpression.xwt b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsKindOfExpression.xwt index 56322dbbe09..19ce7b344f2 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsKindOfExpression.xwt +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsKindOfExpression.xwt @@ -1,6 +1,7 @@ <?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: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> @@ -10,16 +11,7 @@ <Composite.layout> <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> </Composite.layout> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsKindOfExpression:name"></ppe:StringEditor> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsKindOfExpression:description"></ppe:StringEditor> - </Composite> - <Composite> - <Composite.layout> - <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> - </Composite.layout> <ppe:ReferenceDialog input="{Binding}" - property="customumlexpressions:CustomIsKindOfExpression:umlEClass" customLabel="UML Metaclass"></ppe:ReferenceDialog> + property="umlexpressions:AbstractUMLEClassExpression:umlEClass"></ppe:ReferenceDialog> </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsKindOfStereotypeExpression.xwt b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsKindOfStereotypeExpression.xwt index 7752625a4af..24c39397127 100644 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsKindOfStereotypeExpression.xwt +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsKindOfStereotypeExpression.xwt @@ -1,7 +1,9 @@ <?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: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:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> @@ -10,19 +12,10 @@ <Composite.layout> <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> </Composite.layout> + <uml:StereotypeQualifyNamePropertyEditor + input="{Binding}" + property="umlexpressions:AbstractStereotypeExpression:stereotypeQualifiedName"></uml:StereotypeQualifyNamePropertyEditor> <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsKindOfStereotypeExpression:name"></ppe:StringEditor> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsKindOfStereotypeExpression:description"></ppe:StringEditor> - </Composite> - <Composite> - <Composite.layout> - <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> - </Composite.layout> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsKindOfStereotypeExpression:stereotypeQualifiedName" - customLabel="Stereotype Identifier"></ppe:StringEditor> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsKindOfStereotypeExpression:profileURI"></ppe:StringEditor> + property="umlexpressions:AbstractStereotypeExpression:profileURI"></ppe:StringEditor> </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsStereotypedWithExpression.xwt b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsStereotypedWithExpression.xwt index 5f9af150b58..24c39397127 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsStereotypedWithExpression.xwt +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsStereotypedWithExpression.xwt @@ -1,7 +1,9 @@ <?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: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:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> @@ -10,19 +12,10 @@ <Composite.layout> <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> </Composite.layout> + <uml:StereotypeQualifyNamePropertyEditor + input="{Binding}" + property="umlexpressions:AbstractStereotypeExpression:stereotypeQualifiedName"></uml:StereotypeQualifyNamePropertyEditor> <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsStereotypedWithExpression:name"></ppe:StringEditor> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsStereotypedWithExpression:description"></ppe:StringEditor> - </Composite> - <Composite> - <Composite.layout> - <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> - </Composite.layout> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsStereotypedWithExpression:stereotypeQualifiedName" - customLabel="Stereotype Identifier"></ppe:StringEditor> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsStereotypedWithExpression:profileURI"></ppe:StringEditor> + property="umlexpressions:AbstractStereotypeExpression:profileURI"></ppe:StringEditor> </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsTypeOfExpression.xwt b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsTypeOfExpression.xwt index 047221bd0c8..19ce7b344f2 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsTypeOfExpression.xwt +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsTypeOfExpression.xwt @@ -1,6 +1,7 @@ <?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: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> @@ -10,16 +11,7 @@ <Composite.layout> <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> </Composite.layout> - <Composite> - <Composite.layout> - <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> - </Composite.layout> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsTypeOfExpression:name"></ppe:StringEditor> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsTypeOfExpression:description"></ppe:StringEditor> - </Composite> <ppe:ReferenceDialog input="{Binding}" - property="customumlexpressions:CustomIsTypeOfExpression:umlEClass" customLabel="UML Metaclass"></ppe:ReferenceDialog> + property="umlexpressions:AbstractUMLEClassExpression:umlEClass"></ppe:ReferenceDialog> </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsTypeOfStereotypeExpression.xwt b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsTypeOfStereotypeExpression.xwt index e8bc8799ed7..24c39397127 100644 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsTypeOfStereotypeExpression.xwt +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsTypeOfStereotypeExpression.xwt @@ -1,7 +1,9 @@ <?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: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:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> @@ -10,19 +12,10 @@ <Composite.layout> <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> </Composite.layout> + <uml:StereotypeQualifyNamePropertyEditor + input="{Binding}" + property="umlexpressions:AbstractStereotypeExpression:stereotypeQualifiedName"></uml:StereotypeQualifyNamePropertyEditor> <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsTypeOfStereotypeExpression:name"></ppe:StringEditor> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsTypeOfStereotypeExpression:description"></ppe:StringEditor> - </Composite> - <Composite> - <Composite.layout> - <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout> - </Composite.layout> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsTypeOfStereotypeExpression:stereotypeQualifiedName" - customLabel="Stereotype Identifier"></ppe:StringEditor> - <ppe:StringEditor input="{Binding}" - property="umlexpressions:IsTypeOfStereotypeExpression:profileURI"></ppe:StringEditor> + property="umlexpressions:AbstractStereotypeExpression:profileURI"></ppe:StringEditor> </Composite> </Composite>
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleSingleStereotypeAttributeEqualityExpression.xwt b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleSingleStereotypeAttributeEqualityExpression.xwt new file mode 100755 index 00000000000..23f1a026d1b --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleSingleStereotypeAttributeEqualityExpression.xwt @@ -0,0 +1,25 @@ +<?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:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets" + 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="umlexpressions:SingleStereotypeAttributeEqualityExpression:expectedValue"></ppe:StringEditor> + <ppe:StringEditor input="{Binding}" + property="umlexpressions:SingleStereotypeAttributeEqualityExpression:propertyName"></ppe:StringEditor> + <uml:StereotypeQualifyNamePropertyEditor + input="{Binding}" + property="umlexpressions:AbstractStereotypeExpression:stereotypeQualifiedName"></uml:StereotypeQualifyNamePropertyEditor> + <ppe:StringEditor input="{Binding}" + property="umlexpressions:AbstractStereotypeExpression:profileURI"></ppe:StringEditor> + </Composite> +</Composite>
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/umlexpressions.ctx b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/umlexpressions.ctx index d20b8558a01..2caa1edaf92 100644 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/umlexpressions.ctx +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/umlexpressions.ctx @@ -1,163 +1,204 @@ <?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="_wsjoICzsEeeKOdJYr-htag" name="umlexpressions" label="UML Expressions Metamodel"> - <tabs xmi:id="_xcGOsCzsEeeKOdJYr-htag" label="umlexpressions" id="umlexpressions" priority="100"> - <sections xmi:id="_xcGOsSzsEeeKOdJYr-htag" name="Single IsStereotypedWithExpression" sectionFile="ui/SingleIsStereotypedWithExpression.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="_i-UgAJKHEemc-6sEcrB3og" name="umlexpressions"> + <tabs xmi:id="_jnh1EJKHEemc-6sEcrB3og" label="umlexpressions" id="umlexpressions" priority="100"> + <sections xmi:id="_jnzh4JKHEemc-6sEcrB3og" name="Single IsStereotypedWithExpression" sectionFile="ui/SingleIsStereotypedWithExpression.xwt"> <widget href="ui/SingleIsStereotypedWithExpression.xwt#/"/> </sections> - <sections xmi:id="_xcGOsizsEeeKOdJYr-htag" name="Single HasAppliedStereotypesExpression" sectionFile="ui/SingleHasAppliedStereotypesExpression.xwt"> + <sections xmi:id="_jn0I8JKHEemc-6sEcrB3og" name="Single AbstractStereotypeExpression" sectionFile="ui/SingleAbstractStereotypeExpression.xwt"> + <widget href="ui/SingleAbstractStereotypeExpression.xwt#/"/> + </sections> + <sections xmi:id="_jn0I8ZKHEemc-6sEcrB3og" name="Single HasAppliedStereotypesExpression" sectionFile="ui/SingleHasAppliedStereotypesExpression.xwt"> <widget href="ui/SingleHasAppliedStereotypesExpression.xwt#/"/> </sections> - <sections xmi:id="_xcGOsyzsEeeKOdJYr-htag" name="Single IsTypeOfExpression" sectionFile="ui/SingleIsTypeOfExpression.xwt"> + <sections xmi:id="_jn0wAJKHEemc-6sEcrB3og" name="Single IsTypeOfExpression" sectionFile="ui/SingleIsTypeOfExpression.xwt"> <widget href="ui/SingleIsTypeOfExpression.xwt#/"/> </sections> - <sections xmi:id="_xcG1wCzsEeeKOdJYr-htag" name="Single IsKindOfExpression" sectionFile="ui/SingleIsKindOfExpression.xwt"> + <sections xmi:id="_jn0wAZKHEemc-6sEcrB3og" name="Single AbstractUMLEClassExpression" sectionFile="ui/SingleAbstractUMLEClassExpression.xwt"> + <widget href="ui/SingleAbstractUMLEClassExpression.xwt#/"/> + </sections> + <sections xmi:id="_jn0wApKHEemc-6sEcrB3og" name="Single IsKindOfExpression" sectionFile="ui/SingleIsKindOfExpression.xwt"> <widget href="ui/SingleIsKindOfExpression.xwt#/"/> </sections> - <sections xmi:id="_xcG1wSzsEeeKOdJYr-htag" name="Multiple IsStereotypedWithExpression" sectionFile="ui/MultipleIsStereotypedWithExpression.xwt"> + <sections xmi:id="_jn1XEJKHEemc-6sEcrB3og" name="Single IsKindOfStereotypeExpression" sectionFile="ui/SingleIsKindOfStereotypeExpression.xwt"> + <widget href="ui/SingleIsKindOfStereotypeExpression.xwt#/"/> + </sections> + <sections xmi:id="_jn1XEZKHEemc-6sEcrB3og" name="Single IsTypeOfStereotypeExpression" sectionFile="ui/SingleIsTypeOfStereotypeExpression.xwt"> + <widget href="ui/SingleIsTypeOfStereotypeExpression.xwt#/"/> + </sections> + <sections xmi:id="_jn1-IJKHEemc-6sEcrB3og" name="Single SingleStereotypeAttributeEqualityExpression" sectionFile="ui/SingleSingleStereotypeAttributeEqualityExpression.xwt"> + <widget href="ui/SingleSingleStereotypeAttributeEqualityExpression.xwt#/"/> + </sections> + <sections xmi:id="_jn1-IZKHEemc-6sEcrB3og" name="Multiple IsStereotypedWithExpression" sectionFile="ui/MultipleIsStereotypedWithExpression.xwt"> <widget href="ui/MultipleIsStereotypedWithExpression.xwt#/"/> </sections> - <sections xmi:id="_xcG1wizsEeeKOdJYr-htag" name="Multiple HasAppliedStereotypesExpression" sectionFile="ui/MultipleHasAppliedStereotypesExpression.xwt"> + <sections xmi:id="_jn1-IpKHEemc-6sEcrB3og" name="Multiple AbstractStereotypeExpression" sectionFile="ui/MultipleAbstractStereotypeExpression.xwt"> + <widget href="ui/MultipleAbstractStereotypeExpression.xwt#/"/> + </sections> + <sections xmi:id="_jn1-I5KHEemc-6sEcrB3og" name="Multiple HasAppliedStereotypesExpression" sectionFile="ui/MultipleHasAppliedStereotypesExpression.xwt"> <widget href="ui/MultipleHasAppliedStereotypesExpression.xwt#/"/> </sections> - <sections xmi:id="_xcG1wyzsEeeKOdJYr-htag" name="Multiple IsTypeOfExpression" sectionFile="ui/MultipleIsTypeOfExpression.xwt"> + <sections xmi:id="_jn2lMJKHEemc-6sEcrB3og" name="Multiple IsTypeOfExpression" sectionFile="ui/MultipleIsTypeOfExpression.xwt"> <widget href="ui/MultipleIsTypeOfExpression.xwt#/"/> </sections> - <sections xmi:id="_xcG1xCzsEeeKOdJYr-htag" name="Multiple IsKindOfExpression" sectionFile="ui/MultipleIsKindOfExpression.xwt"> - <widget href="ui/MultipleIsKindOfExpression.xwt#/"/> + <sections xmi:id="_jn2lMZKHEemc-6sEcrB3og" name="Multiple AbstractUMLEClassExpression" sectionFile="ui/MultipleAbstractUMLEClassExpression.xwt"> + <widget href="ui/MultipleAbstractUMLEClassExpression.xwt#/"/> </sections> - <sections xmi:id="_4_Dq4q_zEeeaV7Cy9TCK-g" name="Single IsKindOfStereotypeExpression" sectionFile="ui/SingleIsKindOfStereotypeExpression.xwt"> - <widget href="ui/SingleIsKindOfStereotypeExpression.xwt#/"/> - </sections> - <sections xmi:id="_4_Dq46_zEeeaV7Cy9TCK-g" name="Single IsTypeOfStereotypeExpression" sectionFile="ui/SingleIsTypeOfStereotypeExpression.xwt"> - <widget href="ui/SingleIsTypeOfStereotypeExpression.xwt#/"/> + <sections xmi:id="_jn2lMpKHEemc-6sEcrB3og" name="Multiple IsKindOfExpression" sectionFile="ui/MultipleIsKindOfExpression.xwt"> + <widget href="ui/MultipleIsKindOfExpression.xwt#/"/> </sections> - <sections xmi:id="_4_Dq6K_zEeeaV7Cy9TCK-g" name="Multiple IsKindOfStereotypeExpression" sectionFile="ui/MultipleIsKindOfStereotypeExpression.xwt"> + <sections xmi:id="_jn2lM5KHEemc-6sEcrB3og" name="Multiple IsKindOfStereotypeExpression" sectionFile="ui/MultipleIsKindOfStereotypeExpression.xwt"> <widget href="ui/MultipleIsKindOfStereotypeExpression.xwt#/"/> </sections> - <sections xmi:id="_4_Dq6a_zEeeaV7Cy9TCK-g" name="Multiple IsTypeOfStereotypeExpression" sectionFile="ui/MultipleIsTypeOfStereotypeExpression.xwt"> + <sections xmi:id="_jn2lNJKHEemc-6sEcrB3og" name="Multiple IsTypeOfStereotypeExpression" sectionFile="ui/MultipleIsTypeOfStereotypeExpression.xwt"> <widget href="ui/MultipleIsTypeOfStereotypeExpression.xwt#/"/> </sections> + <sections xmi:id="_jn3MQJKHEemc-6sEcrB3og" name="Multiple SingleStereotypeAttributeEqualityExpression" sectionFile="ui/MultipleSingleStereotypeAttributeEqualityExpression.xwt"> + <widget href="ui/MultipleSingleStereotypeAttributeEqualityExpression.xwt#/"/> + </sections> </tabs> - <views xmi:id="_wsjoISzsEeeKOdJYr-htag" name="Single IsStereotypedWithExpression" sections="_xcGOsSzsEeeKOdJYr-htag" automaticContext="true" datacontexts="_wsjoQizsEeeKOdJYr-htag"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_wsjoIizsEeeKOdJYr-htag" name="isSingleIsStereotypedWithExpression"> + <views xmi:id="_i-UgAZKHEemc-6sEcrB3og" name="Single IsStereotypedWithExpression" sections="_jnzh4JKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgSpKHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgApKHEemc-6sEcrB3og" name="isSingleIsStereotypedWithExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoIyzsEeeKOdJYr-htag" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoJCzsEeeKOdJYr-htag" name="className" value="IsStereotypedWithExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgA5KHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgBJKHEemc-6sEcrB3og" name="className" value="IsStereotypedWithExpression"/> </constraints> </views> - <views xmi:id="_wsjoJSzsEeeKOdJYr-htag" name="Single HasAppliedStereotypesExpression" sections="_xcGOsizsEeeKOdJYr-htag" automaticContext="true" datacontexts="_wsjoRSzsEeeKOdJYr-htag"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_wsjoJizsEeeKOdJYr-htag" name="isSingleHasAppliedStereotypesExpression"> + <views xmi:id="_i-UgBZKHEemc-6sEcrB3og" name="Single AbstractStereotypeExpression" sections="_jn0I8JKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgS5KHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgBpKHEemc-6sEcrB3og" name="isSingleAbstractStereotypeExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoJyzsEeeKOdJYr-htag" name="className" value="HasAppliedStereotypesExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoKCzsEeeKOdJYr-htag" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgB5KHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgCJKHEemc-6sEcrB3og" name="className" value="AbstractStereotypeExpression"/> </constraints> </views> - <views xmi:id="_wsjoKSzsEeeKOdJYr-htag" name="Single IsTypeOfExpression" sections="_xcGOsyzsEeeKOdJYr-htag" automaticContext="true" datacontexts="_wsjoRizsEeeKOdJYr-htag"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_wsjoKizsEeeKOdJYr-htag" name="isSingleIsTypeOfExpression"> + <views xmi:id="_i-UgCZKHEemc-6sEcrB3og" name="Single HasAppliedStereotypesExpression" sections="_jn0I8ZKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgTpKHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgCpKHEemc-6sEcrB3og" name="isSingleHasAppliedStereotypesExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoKyzsEeeKOdJYr-htag" name="className" value="IsTypeOfExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoLCzsEeeKOdJYr-htag" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgC5KHEemc-6sEcrB3og" name="className" value="HasAppliedStereotypesExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgDJKHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> </constraints> </views> - <views xmi:id="_wsjoLSzsEeeKOdJYr-htag" name="Single IsKindOfExpression" sections="_xcG1wCzsEeeKOdJYr-htag" automaticContext="true" datacontexts="_wsjoSCzsEeeKOdJYr-htag"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_wsjoLizsEeeKOdJYr-htag" name="isSingleIsKindOfExpression"> + <views xmi:id="_i-UgDZKHEemc-6sEcrB3og" name="Single IsTypeOfExpression" sections="_jn0wAJKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgT5KHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgDpKHEemc-6sEcrB3og" name="isSingleIsTypeOfExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoLyzsEeeKOdJYr-htag" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoMCzsEeeKOdJYr-htag" name="className" value="IsKindOfExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgD5KHEemc-6sEcrB3og" name="className" value="IsTypeOfExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgEJKHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> </constraints> </views> - <views xmi:id="_xy4_Ma_zEeeaV7Cy9TCK-g" name="Single IsKindOfStereotypeExpression" sections="_4_Dq4q_zEeeaV7Cy9TCK-g" automaticContext="true" datacontexts="_xy4_Wq_zEeeaV7Cy9TCK-g"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_xy4_Mq_zEeeaV7Cy9TCK-g" name="isSingleIsKindOfStereotypeExpression"> + <views xmi:id="_i-UgEZKHEemc-6sEcrB3og" name="Single AbstractUMLEClassExpression" sections="_jn0wAZKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgUJKHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgEpKHEemc-6sEcrB3og" name="isSingleAbstractUMLEClassExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_xy4_M6_zEeeaV7Cy9TCK-g" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_xy4_NK_zEeeaV7Cy9TCK-g" name="className" value="IsKindOfStereotypeExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgE5KHEemc-6sEcrB3og" name="className" value="AbstractUMLEClassExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgFJKHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> </constraints> </views> - <views xmi:id="_xy4_Na_zEeeaV7Cy9TCK-g" name="Single IsTypeOfStereotypeExpression" sections="_4_Dq46_zEeeaV7Cy9TCK-g" automaticContext="true" datacontexts="_xy4_Xa_zEeeaV7Cy9TCK-g"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_xy4_Nq_zEeeaV7Cy9TCK-g" name="isSingleIsTypeOfStereotypeExpression"> + <views xmi:id="_i-UgFZKHEemc-6sEcrB3og" name="Single IsKindOfExpression" sections="_jn0wApKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgUpKHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgFpKHEemc-6sEcrB3og" name="isSingleIsKindOfExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_xy4_N6_zEeeaV7Cy9TCK-g" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_xy4_OK_zEeeaV7Cy9TCK-g" name="className" value="IsTypeOfStereotypeExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgF5KHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgGJKHEemc-6sEcrB3og" name="className" value="IsKindOfExpression"/> </constraints> </views> - <views xmi:id="_wsjoMSzsEeeKOdJYr-htag" elementMultiplicity="-1" name="Multiple IsStereotypedWithExpression" sections="_xcG1wSzsEeeKOdJYr-htag" automaticContext="true" datacontexts="_wsjoQizsEeeKOdJYr-htag"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_wsjoMizsEeeKOdJYr-htag" name="isMultipleIsStereotypedWithExpression"> + <views xmi:id="_i-UgGZKHEemc-6sEcrB3og" name="Single IsKindOfStereotypeExpression" sections="_jn1XEJKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgU5KHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgGpKHEemc-6sEcrB3og" name="isSingleIsKindOfStereotypeExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoMyzsEeeKOdJYr-htag" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoNCzsEeeKOdJYr-htag" name="className" value="IsStereotypedWithExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgG5KHEemc-6sEcrB3og" name="className" value="IsKindOfStereotypeExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgHJKHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> </constraints> </views> - <views xmi:id="_wsjoNSzsEeeKOdJYr-htag" elementMultiplicity="-1" name="Multiple HasAppliedStereotypesExpression" sections="_xcG1wizsEeeKOdJYr-htag" automaticContext="true" datacontexts="_wsjoRSzsEeeKOdJYr-htag"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_wsjoNizsEeeKOdJYr-htag" name="isMultipleHasAppliedStereotypesExpression"> + <views xmi:id="_i-UgHZKHEemc-6sEcrB3og" name="Single IsTypeOfStereotypeExpression" sections="_jn1XEZKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgVJKHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgHpKHEemc-6sEcrB3og" name="isSingleIsTypeOfStereotypeExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoNyzsEeeKOdJYr-htag" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoOCzsEeeKOdJYr-htag" name="className" value="HasAppliedStereotypesExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgH5KHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgIJKHEemc-6sEcrB3og" name="className" value="IsTypeOfStereotypeExpression"/> </constraints> </views> - <views xmi:id="_wsjoOSzsEeeKOdJYr-htag" elementMultiplicity="-1" name="Multiple IsTypeOfExpression" sections="_xcG1wyzsEeeKOdJYr-htag" automaticContext="true" datacontexts="_wsjoRizsEeeKOdJYr-htag"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_wsjoOizsEeeKOdJYr-htag" name="isMultipleIsTypeOfExpression"> + <views xmi:id="_i-UgIZKHEemc-6sEcrB3og" name="Single SingleStereotypeAttributeEqualityExpression" sections="_jn1-IJKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgVZKHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgIpKHEemc-6sEcrB3og" name="isSingleSingleStereotypeAttributeEqualityExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoOyzsEeeKOdJYr-htag" name="className" value="IsTypeOfExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoPCzsEeeKOdJYr-htag" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgI5KHEemc-6sEcrB3og" name="className" value="SingleStereotypeAttributeEqualityExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgJJKHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> </constraints> </views> - <views xmi:id="_wsjoPSzsEeeKOdJYr-htag" elementMultiplicity="-1" name="Multiple IsKindOfExpression" sections="_xcG1xCzsEeeKOdJYr-htag" automaticContext="true" datacontexts="_wsjoSCzsEeeKOdJYr-htag"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_wsjoPizsEeeKOdJYr-htag" name="isMultipleIsKindOfExpression"> + <views xmi:id="_i-UgJZKHEemc-6sEcrB3og" elementMultiplicity="-1" name="Multiple IsStereotypedWithExpression" sections="_jn1-IZKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgSpKHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgJpKHEemc-6sEcrB3og" name="isMultipleIsStereotypedWithExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoPyzsEeeKOdJYr-htag" name="className" value="IsKindOfExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_wsjoQCzsEeeKOdJYr-htag" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgJ5KHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgKJKHEemc-6sEcrB3og" name="className" value="IsStereotypedWithExpression"/> </constraints> </views> - <views xmi:id="_xy4_Sa_zEeeaV7Cy9TCK-g" elementMultiplicity="-1" name="Multiple IsKindOfStereotypeExpression" sections="_4_Dq6K_zEeeaV7Cy9TCK-g" automaticContext="true" datacontexts="_xy4_Wq_zEeeaV7Cy9TCK-g"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_xy4_Sq_zEeeaV7Cy9TCK-g" name="isMultipleIsKindOfStereotypeExpression"> + <views xmi:id="_i-UgKZKHEemc-6sEcrB3og" elementMultiplicity="-1" name="Multiple AbstractStereotypeExpression" sections="_jn1-IpKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgS5KHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgKpKHEemc-6sEcrB3og" name="isMultipleAbstractStereotypeExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_xy4_S6_zEeeaV7Cy9TCK-g" name="className" value="IsKindOfStereotypeExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_xy4_TK_zEeeaV7Cy9TCK-g" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgK5KHEemc-6sEcrB3og" name="className" value="AbstractStereotypeExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgLJKHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> </constraints> </views> - <views xmi:id="_xy4_Ta_zEeeaV7Cy9TCK-g" elementMultiplicity="-1" name="Multiple IsTypeOfStereotypeExpression" sections="_4_Dq6a_zEeeaV7Cy9TCK-g" automaticContext="true" datacontexts="_xy4_Xa_zEeeaV7Cy9TCK-g"> - <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_xy4_Tq_zEeeaV7Cy9TCK-g" name="isMultipleIsTypeOfStereotypeExpression"> + <views xmi:id="_i-UgLZKHEemc-6sEcrB3og" elementMultiplicity="-1" name="Multiple HasAppliedStereotypesExpression" sections="_jn1-I5KHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgTpKHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgLpKHEemc-6sEcrB3og" name="isMultipleHasAppliedStereotypesExpression"> <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_xy4_T6_zEeeaV7Cy9TCK-g" name="className" value="IsTypeOfStereotypeExpression"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_xy4_UK_zEeeaV7Cy9TCK-g" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgL5KHEemc-6sEcrB3og" name="className" value="HasAppliedStereotypesExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgMJKHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> </constraints> </views> - <dataContexts xmi:id="_wsjoQSzsEeeKOdJYr-htag" name="umlexpressions" label="umlexpressions"> - <supertypes href="platform:/plugin/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx#_TD6UmSq7EeeggtQf9kdCWQ"/> - <elements xmi:id="_wsjoQizsEeeKOdJYr-htag" name="IsStereotypedWithExpression"> - <properties xmi:id="_wsjoQyzsEeeKOdJYr-htag" name="stereotypeQualifiedName" description="The qualified name of the required stereotype."/> - <properties xmi:id="_wsjoRCzsEeeKOdJYr-htag" name="profileURI" description="The URI of the profile owning the stereotype.
The URI can be null or empty. In this case, we don't check the URI of the profile providing the Stereotype."/> - <supertypes href="platform:/plugin/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx#_TD6Upiq7EeeggtQf9kdCWQ"/> - </elements> - <elements xmi:id="_wsjoRSzsEeeKOdJYr-htag" name="HasAppliedStereotypesExpression"> - <supertypes href="platform:/plugin/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx#_TD6Upiq7EeeggtQf9kdCWQ"/> - </elements> - <elements xmi:id="_wsjoRizsEeeKOdJYr-htag" name="IsTypeOfExpression"> - <properties xmi:id="_wsjoRyzsEeeKOdJYr-htag" name="umlEClass" type="Reference"/> - <supertypes href="platform:/plugin/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx#_TD6Upiq7EeeggtQf9kdCWQ"/> - </elements> - <elements xmi:id="_wsjoSCzsEeeKOdJYr-htag" name="IsKindOfExpression"> - <properties xmi:id="_wsjoSSzsEeeKOdJYr-htag" name="umlEClass" type="Reference"/> - <supertypes href="platform:/plugin/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx#_TD6Upiq7EeeggtQf9kdCWQ"/> - </elements> - <elements xmi:id="_xy4_Wq_zEeeaV7Cy9TCK-g" name="IsKindOfStereotypeExpression"> - <properties xmi:id="_xy4_W6_zEeeaV7Cy9TCK-g" name="stereotypeQualifiedName"/> - <properties xmi:id="_xy4_XK_zEeeaV7Cy9TCK-g" name="profileURI"/> - <supertypes href="platform:/plugin/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx#_TD6Upiq7EeeggtQf9kdCWQ"/> - </elements> - <elements xmi:id="_xy4_Xa_zEeeaV7Cy9TCK-g" name="IsTypeOfStereotypeExpression"> - <properties xmi:id="_xy4_Xq_zEeeaV7Cy9TCK-g" name="stereotypeQualifiedName"/> - <properties xmi:id="_xy4_X6_zEeeaV7Cy9TCK-g" name="profileURI"/> - <supertypes href="platform:/plugin/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx#_TD6Upiq7EeeggtQf9kdCWQ"/> + <views xmi:id="_i-UgMZKHEemc-6sEcrB3og" elementMultiplicity="-1" name="Multiple IsTypeOfExpression" sections="_jn2lMJKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgT5KHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgMpKHEemc-6sEcrB3og" name="isMultipleIsTypeOfExpression"> + <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgM5KHEemc-6sEcrB3og" name="className" value="IsTypeOfExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgNJKHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + </constraints> + </views> + <views xmi:id="_i-UgNZKHEemc-6sEcrB3og" elementMultiplicity="-1" name="Multiple AbstractUMLEClassExpression" sections="_jn2lMZKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgUJKHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgNpKHEemc-6sEcrB3og" name="isMultipleAbstractUMLEClassExpression"> + <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgN5KHEemc-6sEcrB3og" name="className" value="AbstractUMLEClassExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgOJKHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + </constraints> + </views> + <views xmi:id="_i-UgOZKHEemc-6sEcrB3og" elementMultiplicity="-1" name="Multiple IsKindOfExpression" sections="_jn2lMpKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgUpKHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgOpKHEemc-6sEcrB3og" name="isMultipleIsKindOfExpression"> + <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgO5KHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgPJKHEemc-6sEcrB3og" name="className" value="IsKindOfExpression"/> + </constraints> + </views> + <views xmi:id="_i-UgPZKHEemc-6sEcrB3og" elementMultiplicity="-1" name="Multiple IsKindOfStereotypeExpression" sections="_jn2lM5KHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgU5KHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgPpKHEemc-6sEcrB3og" name="isMultipleIsKindOfStereotypeExpression"> + <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgP5KHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgQJKHEemc-6sEcrB3og" name="className" value="IsKindOfStereotypeExpression"/> + </constraints> + </views> + <views xmi:id="_i-UgQZKHEemc-6sEcrB3og" elementMultiplicity="-1" name="Multiple IsTypeOfStereotypeExpression" sections="_jn2lNJKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgVJKHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgQpKHEemc-6sEcrB3og" name="isMultipleIsTypeOfStereotypeExpression"> + <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgQ5KHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgRJKHEemc-6sEcrB3og" name="className" value="IsTypeOfStereotypeExpression"/> + </constraints> + </views> + <views xmi:id="_i-UgRZKHEemc-6sEcrB3og" elementMultiplicity="-1" name="Multiple SingleStereotypeAttributeEqualityExpression" sections="_jn3MQJKHEemc-6sEcrB3og" automaticContext="true" datacontexts="_i-UgVZKHEemc-6sEcrB3og"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_i-UgRpKHEemc-6sEcrB3og" name="isMultipleSingleStereotypeAttributeEqualityExpression"> + <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgR5KHEemc-6sEcrB3og" name="className" value="SingleStereotypeAttributeEqualityExpression"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_i-UgSJKHEemc-6sEcrB3og" name="nsUri" value="http://www.eclipse.org/papyrus/umlexpressions"/> + </constraints> + </views> + <dataContexts xmi:id="_i-UgSZKHEemc-6sEcrB3og" name="umlexpressions" label="umlexpressions"> + <elements xmi:id="_i-UgSpKHEemc-6sEcrB3og" name="IsStereotypedWithExpression" supertypes="_i-UgS5KHEemc-6sEcrB3og"/> + <elements xmi:id="_i-UgS5KHEemc-6sEcrB3og" name="AbstractStereotypeExpression"> + <properties xmi:id="_i-UgTJKHEemc-6sEcrB3og" name="stereotypeQualifiedName" description="The qualified name of the required stereotype."/> + <properties xmi:id="_i-UgTZKHEemc-6sEcrB3og" name="profileURI" description="The URI of the profile owning the stereotype.
The URI can be null or empty. In this case, we don't check the URI of the profile providing the Stereotype."/> </elements> - <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@modelElementFactories.0"/> - </dataContexts> - <dataContexts xmi:id="_zLM00CzsEeeKOdJYr-htag" name="customumlexpressions"> - <elements xmi:id="_8n4KoCzsEeeKOdJYr-htag" name="CustomIsTypeOfExpression" supertypes="_wsjoRizsEeeKOdJYr-htag"> - <properties xmi:id="_8n4KoSzsEeeKOdJYr-htag" name="umlEClass" type="Reference"/> + <elements xmi:id="_i-UgTpKHEemc-6sEcrB3og" name="HasAppliedStereotypesExpression"/> + <elements xmi:id="_i-UgT5KHEemc-6sEcrB3og" name="IsTypeOfExpression" supertypes="_i-UgUJKHEemc-6sEcrB3og"/> + <elements xmi:id="_i-UgUJKHEemc-6sEcrB3og" name="AbstractUMLEClassExpression"> + <properties xmi:id="_i-UgUZKHEemc-6sEcrB3og" name="umlEClass" type="Reference"/> </elements> - <elements xmi:id="_8n4KoizsEeeKOdJYr-htag" name="CustomIsKindOfExpression" supertypes="_wsjoSCzsEeeKOdJYr-htag"> - <properties xmi:id="_8n4KoyzsEeeKOdJYr-htag" name="umlEClass" type="Reference"/> + <elements xmi:id="_i-UgUpKHEemc-6sEcrB3og" name="IsKindOfExpression" supertypes="_i-UgUJKHEemc-6sEcrB3og"/> + <elements xmi:id="_i-UgU5KHEemc-6sEcrB3og" name="IsKindOfStereotypeExpression" supertypes="_i-UgS5KHEemc-6sEcrB3og"/> + <elements xmi:id="_i-UgVJKHEemc-6sEcrB3og" name="IsTypeOfStereotypeExpression" supertypes="_i-UgS5KHEemc-6sEcrB3og"/> + <elements xmi:id="_i-UgVZKHEemc-6sEcrB3og" name="SingleStereotypeAttributeEqualityExpression" supertypes="_i-UgS5KHEemc-6sEcrB3og"> + <properties xmi:id="_i-UgVpKHEemc-6sEcrB3og" name="expectedValue"/> + <properties xmi:id="_i-UgV5KHEemc-6sEcrB3og" name="propertyName" description="The name of the stereotype property. 
The property must be single valued and typde with a PrimitiveTypes"/> </elements> <modelElementFactory href="Environment.xmi#//@modelElementFactories.0"/> </dataContexts> diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/src/org/eclipse/papyrus/uml/expressions/properties/factories/UMLExpressionsModelElement.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/src/org/eclipse/papyrus/uml/expressions/properties/factories/UMLExpressionsModelElement.java index 452619ea4fc..04caa90beaf 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/src/org/eclipse/papyrus/uml/expressions/properties/factories/UMLExpressionsModelElement.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/src/org/eclipse/papyrus/uml/expressions/properties/factories/UMLExpressionsModelElement.java @@ -1,17 +1,17 @@ /***************************************************************************** * 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.uml.expressions.properties.factories; @@ -67,7 +67,6 @@ public class UMLExpressionsModelElement extends EMFModelElement { return super.getContentProvider(propertyPath); } - /** * @see org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement#getLabelProvider(java.lang.String) * diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/.settings/org.eclipse.jdt.core.prefs index 74c6d08d7e4..49ce3e32edf 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/.settings/org.eclipse.jdt.core.prefs @@ -12,6 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -19,17 +20,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -115,11 +119,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -150,6 +155,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -174,13 +181,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -228,6 +239,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -264,9 +277,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -292,6 +308,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/META-INF/MANIFEST.MF b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/META-INF/MANIFEST.MF index 7cc449c4a76..8a86c105b65 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/META-INF/MANIFEST.MF +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.uml.expressions;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.ecore b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.ecore index 324ec91c85e..86102c8300a 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.ecore +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.ecore @@ -2,23 +2,34 @@ <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="umlexpressions" nsURI="http://www.eclipse.org/papyrus/umlexpressions" nsPrefix="umlexpressions"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="A string representing the expected value."/> + </eAnnotations> <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML"> <details key="originalName" value="UMLExpressions"/> </eAnnotations> - <eClassifiers xsi:type="ecore:EClass" name="IsStereotypedWithExpression" eSuperTypes="../../org.eclipse.papyrus.infra.emf.expressions/model/expressions.ecore#//booleanexpressions/IBooleanEObjectExpression"> + <eClassifiers xsi:type="ecore:EClass" name="IsStereotypedWithExpression" eSuperTypes="#//AbstractStereotypeExpression"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="This expression to use to ckech if a UML object is stereotyped with the expected stereotype.
The evaluate method returns TRUE when the object is stereotyped by the stereotype identified by its qualified and when the stereotype comes from a profile with the sasme URI profile has expected.
URI profile field is not mandatory for the test."/> </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="AbstractStereotypeExpression" abstract="true" + eSuperTypes="../../org.eclipse.papyrus.infra.emf.expressions/model/expressions.ecore#//booleanexpressions/IBooleanEObjectExpression"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Abstract Expression working on stereotype. This expression allows to represent a stereotype using its qualified name."/> + </eAnnotations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypeQualifiedName" ordered="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="The qualified name of the required stereotype."/> + <details key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/umlExpressions/StereotypeExpression/StereotypeQualifiedName"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="profileURI" ordered="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="The URI of the profile owning the stereotype.
The URI can be null or empty. In this case, we don't check the URI of the profile providing the Stereotype."/> + <details key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/umlExpressions/StereotypeExpression/ProfileURI"/> </eAnnotations> </eStructuralFeatures> </eClassifiers> @@ -27,36 +38,51 @@ <details key="documentation" value="This expressions tests is stereotypes are applied on the object.
The evaluate method returns TRUE if at least one Stereotype is applied on the object.
The evaluate method returns FALSE if no Stereotype is applied on the object.
The evaluate method returns FALSE when the argument is NULL.
The evaluate method returns FALSE when the argument is not an instance of UML::Element"/> </eAnnotations> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IsTypeOfExpression" eSuperTypes="../../org.eclipse.papyrus.infra.emf.expressions/model/expressions.ecore#//booleanexpressions/IBooleanEObjectExpression"> + <eClassifiers xsi:type="ecore:EClass" name="IsTypeOfExpression" eSuperTypes="#//AbstractUMLEClassExpression"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<p>The evaluate methods returns True if the argument&nbsp;has the&nbsp;same type thant the excepted metaclass.</p>

<p>If the metaclass is not defined, the evaluate method returns False.</p>
"/> </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="AbstractUMLEClassExpression" abstract="true" + eSuperTypes="../../org.eclipse.papyrus.infra.emf.expressions/model/expressions.ecore#//booleanexpressions/IBooleanEObjectExpression"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="This expression allows to represent a UML Metaclass (Ecore EClass)."/> + </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="umlEClass" ordered="false" - eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/> + eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/umlExpressions/UMLEClassExpression/UMLEClass"/> + </eAnnotations> + </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IsKindOfExpression" eSuperTypes="../../org.eclipse.papyrus.infra.emf.expressions/model/expressions.ecore#//booleanexpressions/IBooleanEObjectExpression"> + <eClassifiers xsi:type="ecore:EClass" name="IsKindOfExpression" eSuperTypes="#//AbstractUMLEClassExpression"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<p>The evaluate methods returns True if the arguments is an instance of the expected metaclass.</p>

<p>If the metaclass is not defined, the evaluate method returns False.</p>
"/> </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EReference" name="umlEClass" ordered="false" - eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IsKindOfStereotypeExpression" eSuperTypes="../../org.eclipse.papyrus.infra.emf.expressions/model/expressions.ecore#//booleanexpressions/IBooleanEObjectExpression"> + <eClassifiers xsi:type="ecore:EClass" name="IsKindOfStereotypeExpression" eSuperTypes="#//AbstractStereotypeExpression"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="This expression is used to ckech if a UML object is stereotyped with the expected stereotype.
The evaluate method returns TRUE when the object is stereotyped by the stereotype identified by its qualified name
"/> </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypeQualifiedName" - ordered="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="profileURI" ordered="false" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IsTypeOfStereotypeExpression" eSuperTypes="../../org.eclipse.papyrus.infra.emf.expressions/model/expressions.ecore#//booleanexpressions/IBooleanEObjectExpression"> + <eClassifiers xsi:type="ecore:EClass" name="IsTypeOfStereotypeExpression" eSuperTypes="#//AbstractStereotypeExpression"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="This expression is used to ckech if a UML object is stereotyped with the expected stereotype or with a stereotype instance of the expected stereotype.
The evaluate method returns TRUE when the object is stereotyped by the stereotype identified by its qualified name or by a stereotype instanceof the identified stereotype
"/> </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypeQualifiedName" - ordered="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="profileURI" ordered="false" + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="SingleStereotypeAttributeEqualityExpression" + eSuperTypes="#//AbstractStereotypeExpression"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="This expression allows to check equality between the current property value of the context object and the expected value. 
The evaluate method returns true, in case of equality and false otherwise.
If the propertyName or the stereotypeQualifiedName are not defined, the evalute methods retuns false."/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="expectedValue" ordered="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="propertyName" ordered="false" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The name of the stereotype property. 
The property must be single valued and typde with a PrimitiveTypes"/> + <details key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/umlExpressions/StereotypeAttributeEqualityExpression/AttributeName"/> + </eAnnotations> + </eStructuralFeatures> </eClassifiers> </ecore:EPackage> diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.genmodel b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.genmodel index 08c919a0533..30f22699563 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.genmodel +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.genmodel @@ -37,26 +37,23 @@ <genPackages xsi:type="genmodel:GenPackage" prefix="UMLExpressions" basePackage="org.eclipse.papyrus.uml.expressions" disposableProviderFactory="true" generateModelWizard="false" extensibleProviderFactory="true" childCreationExtenders="true" ecorePackage="umlexpressions.ecore#/"> - <genClasses xsi:type="genmodel:GenClass" ecoreClass="umlexpressions.ecore#//IsStereotypedWithExpression"> - <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute umlexpressions.ecore#//IsStereotypedWithExpression/stereotypeQualifiedName"/> - <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute umlexpressions.ecore#//IsStereotypedWithExpression/profileURI"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="umlexpressions.ecore#//IsStereotypedWithExpression"/> + <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="umlexpressions.ecore#//AbstractStereotypeExpression"> + <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute umlexpressions.ecore#//AbstractStereotypeExpression/stereotypeQualifiedName"/> + <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute umlexpressions.ecore#//AbstractStereotypeExpression/profileURI"/> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="umlexpressions.ecore#//HasAppliedStereotypesExpression"/> - <genClasses xsi:type="genmodel:GenClass" ecoreClass="umlexpressions.ecore#//IsTypeOfExpression"> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="umlexpressions.ecore#//IsTypeOfExpression"/> + <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="umlexpressions.ecore#//AbstractUMLEClassExpression"> <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" - propertySortChoices="true" ecoreFeature="ecore:EReference umlexpressions.ecore#//IsTypeOfExpression/umlEClass"/> + propertySortChoices="true" ecoreFeature="ecore:EReference umlexpressions.ecore#//AbstractUMLEClassExpression/umlEClass"/> </genClasses> - <genClasses xsi:type="genmodel:GenClass" ecoreClass="umlexpressions.ecore#//IsKindOfExpression"> - <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" - propertySortChoices="true" ecoreFeature="ecore:EReference umlexpressions.ecore#//IsKindOfExpression/umlEClass"/> - </genClasses> - <genClasses xsi:type="genmodel:GenClass" ecoreClass="umlexpressions.ecore#//IsKindOfStereotypeExpression"> - <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute umlexpressions.ecore#//IsKindOfStereotypeExpression/stereotypeQualifiedName"/> - <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute umlexpressions.ecore#//IsKindOfStereotypeExpression/profileURI"/> - </genClasses> - <genClasses xsi:type="genmodel:GenClass" ecoreClass="umlexpressions.ecore#//IsTypeOfStereotypeExpression"> - <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute umlexpressions.ecore#//IsTypeOfStereotypeExpression/stereotypeQualifiedName"/> - <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute umlexpressions.ecore#//IsTypeOfStereotypeExpression/profileURI"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="umlexpressions.ecore#//IsKindOfExpression"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="umlexpressions.ecore#//IsKindOfStereotypeExpression"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="umlexpressions.ecore#//IsTypeOfStereotypeExpression"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="umlexpressions.ecore#//SingleStereotypeAttributeEqualityExpression"> + <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute umlexpressions.ecore#//SingleStereotypeAttributeEqualityExpression/expectedValue"/> + <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute umlexpressions.ecore#//SingleStereotypeAttributeEqualityExpression/propertyName"/> </genClasses> </genPackages> </genmodel:GenModel> diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.notation b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.notation index e7a8b29c652..f966e5e4d6f 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.notation +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.notation @@ -25,7 +25,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WkvRCTWEeehXLEpOVl1Ig"/> </children> <element xmi:type="uml:Interface" href="pathmap://EXPRESSIONS//expressions.uml#_P-MkYBVaEee_D4EhwjboOQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WWFwSTWEeehXLEpOVl1Ig" x="240" y="80" width="261"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WWFwSTWEeehXLEpOVl1Ig" x="240" y="-140" width="261"/> </children> <children xmi:type="notation:Shape" xmi:id="_7sdO0CTWEeehXLEpOVl1Ig" type="Class_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_7sec8CTWEeehXLEpOVl1Ig" type="Class_NameLabel"/> @@ -33,13 +33,13 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_7sec8iTWEeehXLEpOVl1Ig" y="15"/> </children> <children xmi:type="notation:BasicCompartment" xmi:id="_7sec8yTWEeehXLEpOVl1Ig" type="Class_AttributeCompartment"> - <children xmi:type="notation:Shape" xmi:id="_SfStcCTXEeehXLEpOVl1Ig" type="Property_ClassAttributeLabel"> - <element xmi:type="uml:Property" href="umlexpressions.uml#_SfFSECTXEeehXLEpOVl1Ig"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_SfStcSTXEeehXLEpOVl1Ig"/> + <children xmi:type="notation:Shape" xmi:id="_I0rIhJKFEemc-6sEcrB3og" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="umlexpressions.uml#_2h_30JKDEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_I0rIhZKFEemc-6sEcrB3og"/> </children> - <children xmi:type="notation:Shape" xmi:id="_i2XvoCskEeeV_fNySaALnw" type="Property_ClassAttributeLabel"> - <element xmi:type="uml:Property" href="umlexpressions.uml#_iz_xECskEeeV_fNySaALnw"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_i2XvoSskEeeV_fNySaALnw"/> + <children xmi:type="notation:Shape" xmi:id="_I0rIhpKFEemc-6sEcrB3og" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="umlexpressions.uml#_2iEJQJKDEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_I0rIh5KFEemc-6sEcrB3og"/> </children> <styles xmi:type="notation:TitleStyle" xmi:id="_7sec9CTWEeehXLEpOVl1Ig"/> <styles xmi:type="notation:SortingStyle" xmi:id="_7sec9STWEeehXLEpOVl1Ig"/> @@ -59,12 +59,12 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7sfEBCTWEeehXLEpOVl1Ig"/> </children> <element xmi:type="uml:Class" href="umlexpressions.uml#_7sVTACTWEeehXLEpOVl1Ig"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7sdO0STWEeehXLEpOVl1Ig" x="640" y="320" width="261"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7sdO0STWEeehXLEpOVl1Ig" x="-40" y="320" width="281" height="141"/> </children> <children xmi:type="notation:Shape" xmi:id="_yNGjACTXEeehXLEpOVl1Ig" type="Comment_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_yNHKECTXEeehXLEpOVl1Ig" type="Comment_BodyLabel"/> <element xmi:type="uml:Comment" href="umlexpressions.uml#_yNBqgCTXEeehXLEpOVl1Ig"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yNGjASTXEeehXLEpOVl1Ig" x="640" y="600" width="244" height="161"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yNGjASTXEeehXLEpOVl1Ig" x="-40" y="540" width="281" height="161"/> </children> <children xmi:type="notation:Shape" xmi:id="_okUUcCslEeeV_fNySaALnw" type="Class_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_okabECslEeeV_fNySaALnw" type="Class_NameLabel"/> @@ -90,12 +90,12 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_okbpOSslEeeV_fNySaALnw"/> </children> <element xmi:type="uml:Class" href="umlexpressions.uml#_okQDACslEeeV_fNySaALnw"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_okUUcSslEeeV_fNySaALnw" x="960" y="320" width="221" height="112"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_okUUcSslEeeV_fNySaALnw" x="-1060" y="100" width="281" height="141"/> </children> <children xmi:type="notation:Shape" xmi:id="_wCbEwCslEeeV_fNySaALnw" type="Comment_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_wCbr0CslEeeV_fNySaALnw" type="Comment_BodyLabel"/> <element xmi:type="uml:Comment" href="umlexpressions.uml#_wCQFoCslEeeV_fNySaALnw"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wCbEwSslEeeV_fNySaALnw" x="920" y="600" width="301" height="161"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wCbEwSslEeeV_fNySaALnw" x="-1060" y="540" width="281" height="161"/> </children> <children xmi:type="notation:Shape" xmi:id="_dbSYUCzXEeeKOdJYr-htag" type="Class_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_dbXQ0CzXEeeKOdJYr-htag" type="Class_NameLabel"/> @@ -103,9 +103,9 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_dbX34SzXEeeKOdJYr-htag" y="15"/> </children> <children xmi:type="notation:BasicCompartment" xmi:id="_dbX34izXEeeKOdJYr-htag" type="Class_AttributeCompartment"> - <children xmi:type="notation:Shape" xmi:id="_jXcNsCzXEeeKOdJYr-htag" type="Property_ClassAttributeLabel"> - <element xmi:type="uml:Property" href="umlexpressions.uml#_jWvDECzXEeeKOdJYr-htag"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_jXcNsSzXEeeKOdJYr-htag"/> + <children xmi:type="notation:Shape" xmi:id="_I0rvkJKFEemc-6sEcrB3og" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="umlexpressions.uml#_CSw6sJKFEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_I0rvkZKFEemc-6sEcrB3og"/> </children> <styles xmi:type="notation:TitleStyle" xmi:id="_dbX34yzXEeeKOdJYr-htag"/> <styles xmi:type="notation:SortingStyle" xmi:id="_dbX35CzXEeeKOdJYr-htag"/> @@ -125,7 +125,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dbYe8yzXEeeKOdJYr-htag"/> </children> <element xmi:type="uml:Class" href="umlexpressions.uml#_dbFkACzXEeeKOdJYr-htag"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dbSYUSzXEeeKOdJYr-htag" x="400" y="320" width="184" height="112"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dbSYUSzXEeeKOdJYr-htag" x="1040" y="320" width="281" height="141"/> </children> <children xmi:type="notation:Shape" xmi:id="_moJwgCzXEeeKOdJYr-htag" type="StereotypeComment"> <styles xmi:type="notation:TitleStyle" xmi:id="_moJwgSzXEeeKOdJYr-htag"/> @@ -138,7 +138,7 @@ <children xmi:type="notation:Shape" xmi:id="_1pDj4CzXEeeKOdJYr-htag" type="Comment_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_1pEK8CzXEeeKOdJYr-htag" type="Comment_BodyLabel"/> <element xmi:type="uml:Comment" href="umlexpressions.uml#_1o9dQCzXEeeKOdJYr-htag"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pDj4SzXEeeKOdJYr-htag" x="420" y="600" width="181" height="161"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pDj4SzXEeeKOdJYr-htag" x="1040" y="540" width="281" height="161"/> </children> <children xmi:type="notation:Shape" xmi:id="_89ygUCzYEeeKOdJYr-htag" type="Class_Shape"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LZoMC680EeemetdP4I8Ciw" source="PapyrusCSSForceValue"> @@ -159,9 +159,9 @@ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LZoMEa80EeemetdP4I8Ciw" source="PapyrusCSSForceValue"> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LZoMEq80EeemetdP4I8Ciw" key="visible" value="true"/> </eAnnotations> - <children xmi:type="notation:Shape" xmi:id="_jq_J4CzZEeeKOdJYr-htag" type="Property_ClassAttributeLabel"> - <element xmi:type="uml:Property" href="umlexpressions.uml#_HrIz0CzZEeeKOdJYr-htag"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_jq_J4SzZEeeKOdJYr-htag"/> + <children xmi:type="notation:Shape" xmi:id="_I0rIiJKFEemc-6sEcrB3og" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="umlexpressions.uml#_CSw6sJKFEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_I0rIiZKFEemc-6sEcrB3og"/> </children> <styles xmi:type="notation:TitleStyle" xmi:id="_89zHZCzYEeeKOdJYr-htag"/> <styles xmi:type="notation:SortingStyle" xmi:id="_89zHZSzYEeeKOdJYr-htag"/> @@ -191,12 +191,12 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_899fcizYEeeKOdJYr-htag"/> </children> <element xmi:type="uml:Class" href="umlexpressions.uml#_89wEECzYEeeKOdJYr-htag"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_89ygUSzYEeeKOdJYr-htag" x="160" y="320" width="184" height="112"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_89ygUSzYEeeKOdJYr-htag" x="680" y="320" width="281" height="141"/> </children> <children xmi:type="notation:Shape" xmi:id="_-wfNACzYEeeKOdJYr-htag" type="Comment_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_-wf0ECzYEeeKOdJYr-htag" type="Comment_BodyLabel"/> <element xmi:type="uml:Comment" href="umlexpressions.uml#_-wdX0CzYEeeKOdJYr-htag"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-wfNASzYEeeKOdJYr-htag" x="160" y="600" width="221" height="161"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-wfNASzYEeeKOdJYr-htag" x="680" y="540" width="281" height="161"/> </children> <children xmi:type="notation:Shape" xmi:id="_TpPHMK8zEeemetdP4I8Ciw" type="Class_Shape"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LZebAK80EeemetdP4I8Ciw" source="PapyrusCSSForceValue"> @@ -217,13 +217,13 @@ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LZoMBa80EeemetdP4I8Ciw" source="PapyrusCSSForceValue"> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LZoMBq80EeemetdP4I8Ciw" key="visible" value="true"/> </eAnnotations> - <children xmi:type="notation:Shape" xmi:id="_uc8aQK8zEeemetdP4I8Ciw" type="Property_ClassAttributeLabel"> - <element xmi:type="uml:Property" href="umlexpressions.uml#_ucH64K8zEeemetdP4I8Ciw"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_uc8aQa8zEeemetdP4I8Ciw"/> + <children xmi:type="notation:Shape" xmi:id="_I0rIgJKFEemc-6sEcrB3og" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="umlexpressions.uml#_2h_30JKDEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_I0rIgZKFEemc-6sEcrB3og"/> </children> - <children xmi:type="notation:Shape" xmi:id="_EUtB0K9iEeexsdIvvO0f9g" type="Property_ClassAttributeLabel"> - <element xmi:type="uml:Property" href="umlexpressions.uml#_ETqgAK9iEeexsdIvvO0f9g"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_EUtB0a9iEeexsdIvvO0f9g"/> + <children xmi:type="notation:Shape" xmi:id="_I0rIgpKFEemc-6sEcrB3og" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="umlexpressions.uml#_2iEJQJKDEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_I0rIg5KFEemc-6sEcrB3og"/> </children> <styles xmi:type="notation:TitleStyle" xmi:id="_TpZfQa8zEeemetdP4I8Ciw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_TpZfQq8zEeemetdP4I8Ciw"/> @@ -253,7 +253,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TpqlAq8zEeemetdP4I8Ciw"/> </children> <element xmi:type="uml:Class" href="umlexpressions.uml#_To5I8K8zEeemetdP4I8Ciw"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TpPHMa8zEeemetdP4I8Ciw" x="-80" y="320" width="184" height="112"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TpPHMa8zEeemetdP4I8Ciw" x="-400" y="320" width="281" height="141"/> </children> <children xmi:type="notation:Shape" xmi:id="_f37RoK8zEeemetdP4I8Ciw" type="Class_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_f374sK8zEeemetdP4I8Ciw" type="Class_NameLabel"/> @@ -261,13 +261,13 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_f374sq8zEeemetdP4I8Ciw" y="15"/> </children> <children xmi:type="notation:BasicCompartment" xmi:id="_f38fwK8zEeemetdP4I8Ciw" type="Class_AttributeCompartment"> - <children xmi:type="notation:Shape" xmi:id="_8vhIAK8zEeemetdP4I8Ciw" type="Property_ClassAttributeLabel"> - <element xmi:type="uml:Property" href="umlexpressions.uml#_8u2ZoK8zEeemetdP4I8Ciw"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_8vhIAa8zEeemetdP4I8Ciw"/> + <children xmi:type="notation:Shape" xmi:id="_I0qhcJKFEemc-6sEcrB3og" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="umlexpressions.uml#_2h_30JKDEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_I0qhcZKFEemc-6sEcrB3og"/> </children> - <children xmi:type="notation:Shape" xmi:id="_KBdJQK9iEeexsdIvvO0f9g" type="Property_ClassAttributeLabel"> - <element xmi:type="uml:Property" href="umlexpressions.uml#_KAjxYK9iEeexsdIvvO0f9g"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_KBdJQa9iEeexsdIvvO0f9g"/> + <children xmi:type="notation:Shape" xmi:id="_I0qhcpKFEemc-6sEcrB3og" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="umlexpressions.uml#_2iEJQJKDEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_I0qhc5KFEemc-6sEcrB3og"/> </children> <styles xmi:type="notation:TitleStyle" xmi:id="_f38fwa8zEeemetdP4I8Ciw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_f38fwq8zEeemetdP4I8Ciw"/> @@ -287,45 +287,141 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f38fzq8zEeemetdP4I8Ciw"/> </children> <element xmi:type="uml:Class" href="umlexpressions.uml#_f3yHsK8zEeemetdP4I8Ciw"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f37Roa8zEeemetdP4I8Ciw" x="-320" y="320" width="184" height="112"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f37Roa8zEeemetdP4I8Ciw" x="-760" y="320" width="281" height="141"/> </children> <children xmi:type="notation:Shape" xmi:id="_14PRsK80EeemetdP4I8Ciw" type="Comment_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_14PRsq80EeemetdP4I8Ciw" type="Comment_BodyLabel"/> <element xmi:type="uml:Comment" href="umlexpressions.uml#_138WwK80EeemetdP4I8Ciw"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_14PRsa80EeemetdP4I8Ciw" x="-360" y="600" width="201" height="161"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_14PRsa80EeemetdP4I8Ciw" x="-760" y="540" width="281" height="161"/> </children> <children xmi:type="notation:Shape" xmi:id="_VcHvMa81EeemetdP4I8Ciw" type="Comment_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_VcHvM681EeemetdP4I8Ciw" type="Comment_BodyLabel"/> <element xmi:type="uml:Comment" href="umlexpressions.uml#_VcHvMK81EeemetdP4I8Ciw"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VcHvMq81EeemetdP4I8Ciw" x="-120" y="600" width="241" height="161"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VcHvMq81EeemetdP4I8Ciw" x="-400" y="540" width="281" height="161"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_IsaTkSTWEeehXLEpOVl1Ig" name="diagram_compatibility_version" stringValue="1.3.0"/> + <children xmi:type="notation:Shape" xmi:id="_h6kIoI6EEemT4f6zJmxUrQ" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_h6oaEI6EEemT4f6zJmxUrQ" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_h6oaEY6EEemT4f6zJmxUrQ" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_h6oaEo6EEemT4f6zJmxUrQ" y="15"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_h6oaE46EEemT4f6zJmxUrQ" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_KWTTUJKFEemc-6sEcrB3og" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="umlexpressions.uml#_wgpBMI6EEemT4f6zJmxUrQ"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_KWTTUZKFEemc-6sEcrB3og"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_KWTTUpKFEemc-6sEcrB3og" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="umlexpressions.uml#_605fQI6EEemT4f6zJmxUrQ"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_KWTTU5KFEemc-6sEcrB3og"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_KWT6YJKFEemc-6sEcrB3og" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="umlexpressions.uml#_2h_30JKDEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_KWT6YZKFEemc-6sEcrB3og"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_KWT6YpKFEemc-6sEcrB3og" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="umlexpressions.uml#_2iEJQJKDEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_KWT6Y5KFEemc-6sEcrB3og"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_h6oaFI6EEemT4f6zJmxUrQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_h6oaFY6EEemT4f6zJmxUrQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_h6oaFo6EEemT4f6zJmxUrQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h6oaF46EEemT4f6zJmxUrQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_h6pBII6EEemT4f6zJmxUrQ" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_h6pBIY6EEemT4f6zJmxUrQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_h6pBIo6EEemT4f6zJmxUrQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_h6pBI46EEemT4f6zJmxUrQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h6pBJI6EEemT4f6zJmxUrQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_h6pBJY6EEemT4f6zJmxUrQ" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_h6pBJo6EEemT4f6zJmxUrQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_h6pBJ46EEemT4f6zJmxUrQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_h6pBKI6EEemT4f6zJmxUrQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h6pBKY6EEemT4f6zJmxUrQ"/> + </children> + <element xmi:type="uml:Class" href="umlexpressions.uml#_h6WtQI6EEemT4f6zJmxUrQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h6kIoY6EEemT4f6zJmxUrQ" x="320" y="320" width="281" height="141"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_ePlPMI6FEemT4f6zJmxUrQ" type="Comment_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_ePl2QI6FEemT4f6zJmxUrQ" type="Comment_BodyLabel"/> + <element xmi:type="uml:Comment" href="umlexpressions.uml#_d3xMII6FEemT4f6zJmxUrQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ePlPMY6FEemT4f6zJmxUrQ" x="320" y="540" width="281" height="161"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_xkvToJKDEemc-6sEcrB3og" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_xky-AJKDEemc-6sEcrB3og" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_xkzlEJKDEemc-6sEcrB3og" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_xkzlEZKDEemc-6sEcrB3og" y="15"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_xkzlEpKDEemc-6sEcrB3og" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_K2gS0JKEEemc-6sEcrB3og" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="umlexpressions.uml#_2h_30JKDEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_K2gS0ZKEEemc-6sEcrB3og"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_K3wQAJKEEemc-6sEcrB3og" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="umlexpressions.uml#_2iEJQJKDEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_K3wQAZKEEemc-6sEcrB3og"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_xkzlE5KDEemc-6sEcrB3og"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_xkzlFJKDEemc-6sEcrB3og"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_xkzlFZKDEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xkzlFpKDEemc-6sEcrB3og"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_xkzlF5KDEemc-6sEcrB3og" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xkzlGJKDEemc-6sEcrB3og"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_xkzlGZKDEemc-6sEcrB3og"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_xkzlGpKDEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xkzlG5KDEemc-6sEcrB3og"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_xk0MIJKDEemc-6sEcrB3og" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xk0MIZKDEemc-6sEcrB3og"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_xk0MIpKDEemc-6sEcrB3og"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_xk0MI5KDEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xk0MJJKDEemc-6sEcrB3og"/> + </children> + <element xmi:type="uml:Class" href="umlexpressions.uml#_xjq8oJKDEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xkvToZKDEemc-6sEcrB3og" x="-220" y="100" width="281" height="141"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_yDvuYJKEEemc-6sEcrB3og" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_yDvuYpKEEemc-6sEcrB3og" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_yDvuY5KEEemc-6sEcrB3og" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_yDvuZJKEEemc-6sEcrB3og" y="15"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_yDvuZZKEEemc-6sEcrB3og" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_ENb3oJKFEemc-6sEcrB3og" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="umlexpressions.uml#_CSw6sJKFEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_ENb3oZKFEemc-6sEcrB3og"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_yDvuZpKEEemc-6sEcrB3og"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_yDvuZ5KEEemc-6sEcrB3og"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_yDvuaJKEEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yDvuaZKEEemc-6sEcrB3og"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_yDvuapKEEemc-6sEcrB3og" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_yDvua5KEEemc-6sEcrB3og"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_yDvubJKEEemc-6sEcrB3og"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_yDvubZKEEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yDwVcJKEEemc-6sEcrB3og"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_yDwVcZKEEemc-6sEcrB3og" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_yDwVcpKEEemc-6sEcrB3og"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_yDwVc5KEEemc-6sEcrB3og"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_yDwVdJKEEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yDwVdZKEEemc-6sEcrB3og"/> + </children> + <element xmi:type="uml:Class" href="umlexpressions.uml#_yDtSIJKEEemc-6sEcrB3og"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yDvuYZKEEemc-6sEcrB3og" x="840" y="100" width="281" height="141"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_IsaTkSTWEeehXLEpOVl1Ig" name="diagram_compatibility_version" stringValue="1.4.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_IsaTkiTWEeehXLEpOVl1Ig"/> <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_IsaTkyTWEeehXLEpOVl1Ig" diagramKindId="org.eclipse.papyrus.uml.diagram.class"> <owner xmi:type="uml:Model" href="umlexpressions.uml#_IqN7MCTWEeehXLEpOVl1Ig"/> </styles> <element xmi:type="uml:Model" href="umlexpressions.uml#_IqN7MCTWEeehXLEpOVl1Ig"/> - <edges xmi:type="notation:Connector" xmi:id="_DgHYYCTXEeehXLEpOVl1Ig" type="InterfaceRealization_Edge" source="_7sdO0CTWEeehXLEpOVl1Ig" target="_2WWFwCTWEeehXLEpOVl1Ig" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_DgH_cCTXEeehXLEpOVl1Ig" type="InterfaceRealization_StereotypeLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QncbACTXEeehXLEpOVl1Ig" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_DgH_cSTXEeehXLEpOVl1Ig" y="39"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_DgH_ciTXEeehXLEpOVl1Ig" type="InterfaceRealization_NameLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QnpPUCTXEeehXLEpOVl1Ig" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_DgH_cyTXEeehXLEpOVl1Ig" x="-1" y="59"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_DgHYYSTXEeehXLEpOVl1Ig"/> - <element xmi:type="uml:InterfaceRealization" href="umlexpressions.uml#_DgADoCTXEeehXLEpOVl1Ig"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DgHYYiTXEeehXLEpOVl1Ig" points="[760, 320, -643984, -643984]$[760, 260, -643984, -643984]$[360, 260, -643984, -643984]$[360, 184, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DgX3ECTXEeehXLEpOVl1Ig" id="(0.45977011494252873,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DgX3ESTXEeehXLEpOVl1Ig" id="(0.5363984674329502,1.0)"/> - </edges> <edges xmi:type="notation:Connector" xmi:id="_4W9dMCTXEeehXLEpOVl1Ig" type="Comment_AnnotatedElementEdge" source="_yNGjACTXEeehXLEpOVl1Ig" target="_7sdO0CTWEeehXLEpOVl1Ig" routing="Rectilinear"> <styles xmi:type="notation:FontStyle" xmi:id="_4W9dMSTXEeehXLEpOVl1Ig"/> <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4W9dMiTXEeehXLEpOVl1Ig" points="[760, 600, -643984, -643984]$[760, 520, -643984, -643984]$[760, 432, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XQYICTXEeehXLEpOVl1Ig" id="(0.4918032786885246,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XQ_MCTXEeehXLEpOVl1Ig" id="(0.45977011494252873,1.0)"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4W9dMiTXEeehXLEpOVl1Ig" points="[100, 540, -643984, -643984]$[100, 520, -643984, -643984]$[100, 461, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XQYICTXEeehXLEpOVl1Ig" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XQ_MCTXEeehXLEpOVl1Ig" id="(0.498220640569395,1.0)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_sDFhYCslEeeV_fNySaALnw" type="InterfaceRealization_Edge" source="_okUUcCslEeeV_fNySaALnw" target="_2WWFwCTWEeehXLEpOVl1Ig" routing="Rectilinear"> <children xmi:type="notation:DecorationNode" xmi:id="_sDGIcCslEeeV_fNySaALnw" type="InterfaceRealization_NameLabel"> @@ -338,104 +434,141 @@ </children> <styles xmi:type="notation:FontStyle" xmi:id="_sDFhYSslEeeV_fNySaALnw"/> <element xmi:type="uml:InterfaceRealization" href="umlexpressions.uml#_sBu2gCslEeeV_fNySaALnw"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sDFhYislEeeV_fNySaALnw" points="[1080, 320, -643984, -643984]$[1080, 260, -643984, -643984]$[360, 260, -643984, -643984]$[360, 184, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sFRSsCslEeeV_fNySaALnw" id="(0.5429864253393665,0.0)"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sDFhYislEeeV_fNySaALnw" points="[-920, 100, -643984, -643984]$[-920, 40, -643984, -643984]$[380, 40, -643984, -643984]$[380, -36, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sFRSsCslEeeV_fNySaALnw" id="(0.498220640569395,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sFRSsSslEeeV_fNySaALnw" id="(0.5363984674329502,1.0)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_O8lP0CsmEeeV_fNySaALnw" type="Comment_AnnotatedElementEdge" source="_wCbEwCslEeeV_fNySaALnw" target="_okUUcCslEeeV_fNySaALnw"> <styles xmi:type="notation:FontStyle" xmi:id="_O8lP0SsmEeeV_fNySaALnw"/> <element xsi:nil="true"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O8lP0ismEeeV_fNySaALnw" points="[942, 600, -643984, -643984]$[942, 432, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q_pTwCsmEeeV_fNySaALnw" id="(0.53156146179402,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dXU9IK8zEeemetdP4I8Ciw" id="(0.5429864253393665,1.0)"/> - </edges> - <edges xmi:type="notation:Connector" xmi:id="_vxrg0CzXEeeKOdJYr-htag" type="InterfaceRealization_Edge" source="_dbSYUCzXEeeKOdJYr-htag" target="_2WWFwCTWEeehXLEpOVl1Ig" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_vxrg0yzXEeeKOdJYr-htag" type="InterfaceRealization_StereotypeLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yfcuoCzXEeeKOdJYr-htag" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_vxsH4CzXEeeKOdJYr-htag" y="40"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_vxsH4SzXEeeKOdJYr-htag" type="InterfaceRealization_NameLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yf2XQCzXEeeKOdJYr-htag" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_vxsH4izXEeeKOdJYr-htag" y="60"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_vxrg0SzXEeeKOdJYr-htag"/> - <element xmi:type="uml:InterfaceRealization" href="umlexpressions.uml#_vxKjcCzXEeeKOdJYr-htag"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vxrg0izXEeeKOdJYr-htag" points="[500, 320, -643984, -643984]$[500, 260, -643984, -643984]$[360, 260, -643984, -643984]$[360, 184, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vyVBECzXEeeKOdJYr-htag" id="(0.5434782608695652,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vyVBESzXEeeKOdJYr-htag" id="(0.5363984674329502,1.0)"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q_pTwCsmEeeV_fNySaALnw" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dXU9IK8zEeemetdP4I8Ciw" id="(0.498220640569395,1.0)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_Qj1vUCzYEeeKOdJYr-htag" type="Comment_AnnotatedElementEdge" source="_1pDj4CzXEeeKOdJYr-htag" target="_dbSYUCzXEeeKOdJYr-htag"> <styles xmi:type="notation:FontStyle" xmi:id="_Qj1vUSzYEeeKOdJYr-htag"/> <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Qj1vUizYEeeKOdJYr-htag" points="[162, 600, -643984, -643984]$[160, 432, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RgdIkCzYEeeKOdJYr-htag" id="(0.4419889502762431,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RgdvoCzYEeeKOdJYr-htag" id="(0.5434782608695652,1.0)"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Qj1vUizYEeeKOdJYr-htag" points="[1602, 600, -643984, -643984]$[1600, 432, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RgdIkCzYEeeKOdJYr-htag" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RgdvoCzYEeeKOdJYr-htag" id="(0.498220640569395,1.0)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_TkH0ACzZEeeKOdJYr-htag" type="Comment_AnnotatedElementEdge" source="_-wfNACzYEeeKOdJYr-htag" target="_89ygUCzYEeeKOdJYr-htag"> <styles xmi:type="notation:FontStyle" xmi:id="_TkH0ASzZEeeKOdJYr-htag"/> <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TkH0AizZEeeKOdJYr-htag" points="[-81, 600, -643984, -643984]$[116, 432, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HgtPIK8zEeemetdP4I8Ciw" id="(0.45248868778280543,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UxaGgCzZEeeKOdJYr-htag" id="(0.5434782608695652,1.0)"/> - </edges> - <edges xmi:type="notation:Connector" xmi:id="_fjPRYCzZEeeKOdJYr-htag" type="InterfaceRealization_Edge" source="_89ygUCzYEeeKOdJYr-htag" target="_2WWFwCTWEeehXLEpOVl1Ig" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_fjPRYyzZEeeKOdJYr-htag" type="InterfaceRealization_StereotypeLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gmKuACzZEeeKOdJYr-htag" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_fjPRZCzZEeeKOdJYr-htag" y="40"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_fjPRZSzZEeeKOdJYr-htag" type="InterfaceRealization_NameLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gmXiUCzZEeeKOdJYr-htag" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_fjPRZizZEeeKOdJYr-htag" y="60"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_fjPRYSzZEeeKOdJYr-htag"/> - <element xmi:type="uml:InterfaceRealization" href="umlexpressions.uml#_fi8WcCzZEeeKOdJYr-htag"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fjPRYizZEeeKOdJYr-htag" points="[260, 320, -643984, -643984]$[260, 260, -643984, -643984]$[360, 260, -643984, -643984]$[360, 184, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fjw10CzZEeeKOdJYr-htag" id="(0.5434782608695652,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fjw10SzZEeeKOdJYr-htag" id="(0.5363984674329502,1.0)"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TkH0AizZEeeKOdJYr-htag" points="[1359, 600, -643984, -643984]$[1556, 432, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HgtPIK8zEeemetdP4I8Ciw" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UxaGgCzZEeeKOdJYr-htag" id="(0.498220640569395,1.0)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_x88rYK81EeemetdP4I8Ciw" type="Comment_AnnotatedElementEdge" source="_VcHvMa81EeemetdP4I8Ciw" target="_TpPHMK8zEeemetdP4I8Ciw"> <styles xmi:type="notation:FontStyle" xmi:id="_x88rYa81EeemetdP4I8Ciw"/> <element xsi:nil="true"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_x88rYq81EeemetdP4I8Ciw" points="[0, 600, -643984, -643984]$[0, 432, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x-I-MK81EeemetdP4I8Ciw" id="(0.4979253112033195,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x-SIIK81EeemetdP4I8Ciw" id="(0.43478260869565216,1.0)"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x-I-MK81EeemetdP4I8Ciw" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x-SIIK81EeemetdP4I8Ciw" id="(0.498220640569395,1.0)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_zD6TcK81EeemetdP4I8Ciw" type="Comment_AnnotatedElementEdge" source="_14PRsK80EeemetdP4I8Ciw" target="_f37RoK8zEeemetdP4I8Ciw"> <styles xmi:type="notation:FontStyle" xmi:id="_zD6Tca81EeemetdP4I8Ciw"/> <element xsi:nil="true"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zD6Tcq81EeemetdP4I8Ciw" points="[-260, 600, -643984, -643984]$[-260, 432, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zFZhMK81EeemetdP4I8Ciw" id="(0.4975124378109453,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zFZhMa81EeemetdP4I8Ciw" id="(0.32608695652173914,1.0)"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zFZhMK81EeemetdP4I8Ciw" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zFZhMa81EeemetdP4I8Ciw" id="(0.498220640569395,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_gJ608I6FEemT4f6zJmxUrQ" type="Comment_AnnotatedElementEdge" source="_ePlPMI6FEemT4f6zJmxUrQ" target="_h6kIoI6EEemT4f6zJmxUrQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_gJ608Y6FEemT4f6zJmxUrQ"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gJ608o6FEemT4f6zJmxUrQ" points="[620, 600, -643984, -643984]$[620, 441, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a2TXYJKEEemc-6sEcrB3og" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_V2eAUJKEEemc-6sEcrB3og" id="(0.498220640569395,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_09wd4JKDEemc-6sEcrB3og" type="InterfaceRealization_Edge" source="_xkvToJKDEemc-6sEcrB3og" target="_2WWFwCTWEeehXLEpOVl1Ig"> + <children xmi:type="notation:DecorationNode" xmi:id="_09xE8JKDEemc-6sEcrB3og" type="InterfaceRealization_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9pGdYJKDEemc-6sEcrB3og" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_09xE8ZKDEemc-6sEcrB3og" y="40"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_09xE8pKDEemc-6sEcrB3og" type="InterfaceRealization_NameLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9pnawJKDEemc-6sEcrB3og" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_09xE85KDEemc-6sEcrB3og" y="60"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_09wd4ZKDEemc-6sEcrB3og"/> + <element xmi:type="uml:InterfaceRealization" href="umlexpressions.uml#_087-gJKDEemc-6sEcrB3og"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_09wd4pKDEemc-6sEcrB3og" points="[140, 100, -643984, -643984]$[140, 40, -643984, -643984]$[380, 40, -643984, -643984]$[380, -36, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0_EsgJKDEemc-6sEcrB3og" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0_EsgZKDEemc-6sEcrB3og" id="(0.5363984674329502,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_u8xWYJKEEemc-6sEcrB3og" type="Generalization_Edge" source="_f37RoK8zEeemetdP4I8Ciw" target="_xkvToJKDEemc-6sEcrB3og"> + <children xmi:type="notation:DecorationNode" xmi:id="_u8xWY5KEEemc-6sEcrB3og" type="Generalization_StereotypeLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_u8xWZJKEEemc-6sEcrB3og" y="40"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_u8xWYZKEEemc-6sEcrB3og"/> + <element xmi:type="uml:Generalization" href="umlexpressions.uml#_u8UDYJKEEemc-6sEcrB3og"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_u8xWYpKEEemc-6sEcrB3og" points="[-620, 320, -643984, -643984]$[-80, 241, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u9u_sJKEEemc-6sEcrB3og" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u9u_sZKEEemc-6sEcrB3og" id="(0.498220640569395,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_vr0NsJKEEemc-6sEcrB3og" type="Generalization_Edge" source="_TpPHMK8zEeemetdP4I8Ciw" target="_xkvToJKDEemc-6sEcrB3og"> + <children xmi:type="notation:DecorationNode" xmi:id="_vr0Ns5KEEemc-6sEcrB3og" type="Generalization_StereotypeLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_vr0NtJKEEemc-6sEcrB3og" y="40"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_vr0NsZKEEemc-6sEcrB3og"/> + <element xmi:type="uml:Generalization" href="umlexpressions.uml#_vq2kYJKEEemc-6sEcrB3og"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vr0NspKEEemc-6sEcrB3og" points="[-260, 320, -643984, -643984]$[-80, 241, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vsuMoJKEEemc-6sEcrB3og" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vsuMoZKEEemc-6sEcrB3og" id="(0.498220640569395,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_wPNOoJKEEemc-6sEcrB3og" type="Generalization_Edge" source="_7sdO0CTWEeehXLEpOVl1Ig" target="_xkvToJKDEemc-6sEcrB3og"> + <children xmi:type="notation:DecorationNode" xmi:id="_wPNOo5KEEemc-6sEcrB3og" type="Generalization_StereotypeLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_wPNOpJKEEemc-6sEcrB3og" y="40"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_wPNOoZKEEemc-6sEcrB3og"/> + <element xmi:type="uml:Generalization" href="umlexpressions.uml#_wOqcEJKEEemc-6sEcrB3og"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wPNOopKEEemc-6sEcrB3og" points="[100, 320, -643984, -643984]$[-80, 241, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wQDjMJKEEemc-6sEcrB3og" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wQDjMZKEEemc-6sEcrB3og" id="(0.498220640569395,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_wymPkJKEEemc-6sEcrB3og" type="Generalization_Edge" source="_h6kIoI6EEemT4f6zJmxUrQ" target="_xkvToJKDEemc-6sEcrB3og"> + <children xmi:type="notation:DecorationNode" xmi:id="_wym2oJKEEemc-6sEcrB3og" type="Generalization_StereotypeLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_wym2oZKEEemc-6sEcrB3og" y="40"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_wymPkZKEEemc-6sEcrB3og"/> + <element xmi:type="uml:Generalization" href="umlexpressions.uml#_wyAZsJKEEemc-6sEcrB3og"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wymPkpKEEemc-6sEcrB3og" points="[460, 320, -643984, -643984]$[-80, 241, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wzbWAJKEEemc-6sEcrB3og" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wzbWAZKEEemc-6sEcrB3og" id="(0.498220640569395,1.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_31ayEJKEEemc-6sEcrB3og" type="InterfaceRealization_Edge" source="_yDvuYJKEEemc-6sEcrB3og" target="_2WWFwCTWEeehXLEpOVl1Ig"> + <children xmi:type="notation:DecorationNode" xmi:id="_31bZIJKEEemc-6sEcrB3og" type="InterfaceRealization_StereotypeLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4NhwEJKEEemc-6sEcrB3og" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_31bZIZKEEemc-6sEcrB3og" y="40"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_31bZIpKEEemc-6sEcrB3og" type="InterfaceRealization_NameLabel"> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4OARMJKEEemc-6sEcrB3og" name="IS_UPDATED_POSITION" booleanValue="true"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_31bZI5KEEemc-6sEcrB3og" y="60"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_31ayEZKEEemc-6sEcrB3og"/> + <element xmi:type="uml:InterfaceRealization" href="umlexpressions.uml#_31BwgJKEEemc-6sEcrB3og"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_31ayEpKEEemc-6sEcrB3og" points="[820, 100, -643984, -643984]$[820, 40, -643984, -643984]$[380, 40, -643984, -643984]$[380, -36, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_32WmMJKEEemc-6sEcrB3og" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_32WmMZKEEemc-6sEcrB3og" id="(0.5363984674329502,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_QU2JAK9ZEeexsdIvvO0f9g" type="InterfaceRealization_Edge" source="_TpPHMK8zEeemetdP4I8Ciw" target="_2WWFwCTWEeehXLEpOVl1Ig" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_QU4lQK9ZEeexsdIvvO0f9g" type="InterfaceRealization_StereotypeLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UuhfAK9ZEeexsdIvvO0f9g" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_QU4lQa9ZEeexsdIvvO0f9g" y="40"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_QU5MUK9ZEeexsdIvvO0f9g" type="InterfaceRealization_NameLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UvCcYK9ZEeexsdIvvO0f9g" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_QU5MUa9ZEeexsdIvvO0f9g" y="60"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_QU2JAa9ZEeexsdIvvO0f9g"/> - <element xmi:type="uml:InterfaceRealization" href="umlexpressions.uml#_QTxyAK9ZEeexsdIvvO0f9g"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QU2JAq9ZEeexsdIvvO0f9g" points="[20, 320, -643984, -643984]$[20, 260, -643984, -643984]$[380, 260, -643984, -643984]$[380, 184, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QWpf0K9ZEeexsdIvvO0f9g" id="(0.5434782608695652,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QWqG4K9ZEeexsdIvvO0f9g" id="(0.5363984674329502,1.0)"/> + <edges xmi:type="notation:Connector" xmi:id="_9KdkIJKEEemc-6sEcrB3og" type="Generalization_Edge" source="_89ygUCzYEeeKOdJYr-htag" target="_yDvuYJKEEemc-6sEcrB3og"> + <children xmi:type="notation:DecorationNode" xmi:id="_9KdkI5KEEemc-6sEcrB3og" type="Generalization_StereotypeLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_9KdkJJKEEemc-6sEcrB3og" y="40"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_9KdkIZKEEemc-6sEcrB3og"/> + <element xmi:type="uml:Generalization" href="umlexpressions.uml#_9J1SAJKEEemc-6sEcrB3og"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9KdkIpKEEemc-6sEcrB3og" points="[820, 320, -643984, -643984]$[980, 241, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9Lb0gJKEEemc-6sEcrB3og" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9Lb0gZKEEemc-6sEcrB3og" id="(0.498220640569395,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_RwDiwK9ZEeexsdIvvO0f9g" type="InterfaceRealization_Edge" source="_f37RoK8zEeemetdP4I8Ciw" target="_2WWFwCTWEeehXLEpOVl1Ig" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_RwDiw69ZEeexsdIvvO0f9g" type="InterfaceRealization_StereotypeLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VN14QK9ZEeexsdIvvO0f9g" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_RwEJ0K9ZEeexsdIvvO0f9g" y="40"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_RwEJ0a9ZEeexsdIvvO0f9g" type="InterfaceRealization_NameLabel"> - <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VObuIK9ZEeexsdIvvO0f9g" name="IS_UPDATED_POSITION" booleanValue="true"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_RwEJ0q9ZEeexsdIvvO0f9g" y="60"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_RwDiwa9ZEeexsdIvvO0f9g"/> - <element xmi:type="uml:InterfaceRealization" href="umlexpressions.uml#_RvOcUK9ZEeexsdIvvO0f9g"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RwDiwq9ZEeexsdIvvO0f9g" points="[-240, 320, -643984, -643984]$[-240, 260, -643984, -643984]$[380, 260, -643984, -643984]$[380, 184, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Rxlz0K9ZEeexsdIvvO0f9g" id="(0.43478260869565216,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Rxma4K9ZEeexsdIvvO0f9g" id="(0.5363984674329502,1.0)"/> + <edges xmi:type="notation:Connector" xmi:id="_9qg9MJKEEemc-6sEcrB3og" type="Generalization_Edge" source="_dbSYUCzXEeeKOdJYr-htag" target="_yDvuYJKEEemc-6sEcrB3og"> + <children xmi:type="notation:DecorationNode" xmi:id="_9qg9M5KEEemc-6sEcrB3og" type="Generalization_StereotypeLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_9qg9NJKEEemc-6sEcrB3og" y="40"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_9qg9MZKEEemc-6sEcrB3og"/> + <element xmi:type="uml:Generalization" href="umlexpressions.uml#_9qH7oJKEEemc-6sEcrB3og"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9qg9MpKEEemc-6sEcrB3og" points="[1180, 320, -643984, -643984]$[980, 241, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9rX40JKEEemc-6sEcrB3og" id="(0.498220640569395,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9rX40ZKEEemc-6sEcrB3og" id="(0.498220640569395,1.0)"/> </edges> </notation:Diagram> <css:ModelStyleSheets xmi:id="_-J2o4CTXEeehXLEpOVl1Ig"> diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.uml b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.uml index 122c7c56bc3..bc661c656ad 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.uml +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.uml @@ -35,31 +35,14 @@ The evaluate method returns TRUE when the object is stereotyped by the stereotyp The evaluate method returns TRUE when the object is stereotyped by the stereotype identified by its qualified name or by a stereotype instanceof the identified stereotype
 </body> </ownedComment> + <ownedComment xmi:type="uml:Comment" xmi:id="_Eh2swI6FEemT4f6zJmxUrQ" annotatedElement="_IqN7MCTWEeehXLEpOVl1Ig"> + <body>A string representing the expected value.</body> + </ownedComment> <packageImport xmi:type="uml:PackageImport" xmi:id="_xqIOQCTWEeehXLEpOVl1Ig"> <importedPackage xmi:type="uml:Model" href="pathmap://EXPRESSIONS//expressions.uml#_s7iicBUjEee_D4EhwjboOQ"/> </packageImport> <packagedElement xmi:type="uml:Class" xmi:id="_7sVTACTWEeehXLEpOVl1Ig" name="IsStereotypedWithExpression"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_SfFSECTXEeehXLEpOVl1Ig" name="stereotypeQualifiedName"> - <ownedComment xmi:type="uml:Comment" xmi:id="_lGfisCslEeeV_fNySaALnw" annotatedElement="_SfFSECTXEeehXLEpOVl1Ig"> - <body>The qualified name of the required stereotype.</body> - </ownedComment> - <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_b-hoACTXEeehXLEpOVl1Ig"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_b-3mQCTXEeehXLEpOVl1Ig" value="1"/> - </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_iz_xECskEeeV_fNySaALnw" name="profileURI"> - <ownedComment xmi:type="uml:Comment" xmi:id="_niiHUCslEeeV_fNySaALnw" annotatedElement="_iz_xECskEeeV_fNySaALnw"> - <body>The URI of the profile owning the stereotype.
 -The URI can be null or empty. In this case, we don't check the URI of the profile providing the Stereotype.</body> - </ownedComment> - <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lXEKwCskEeeV_fNySaALnw"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lXS0QCskEeeV_fNySaALnw" value="1"/> - </ownedAttribute> - <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_DgADoCTXEeehXLEpOVl1Ig" client="_7sVTACTWEeehXLEpOVl1Ig"> - <supplier xmi:type="uml:Interface" href="pathmap://EXPRESSIONS//expressions.uml#_P-MkYBVaEee_D4EhwjboOQ"/> - <contract xmi:type="uml:Interface" href="pathmap://EXPRESSIONS//expressions.uml#_P-MkYBVaEee_D4EhwjboOQ"/> - </interfaceRealization> + <generalization xmi:type="uml:Generalization" xmi:id="_wOqcEJKEEemc-6sEcrB3og" general="_xjq8oJKDEemc-6sEcrB3og"/> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_okQDACslEeeV_fNySaALnw" name="HasAppliedStereotypesExpression"> <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_sBu2gCslEeeV_fNySaALnw" client="_okQDACslEeeV_fNySaALnw"> @@ -68,55 +51,85 @@ The URI can be null or empty. In this case, we don't check the URI of the profil </interfaceRealization> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_dbFkACzXEeeKOdJYr-htag" name="IsTypeOfExpression"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_jWvDECzXEeeKOdJYr-htag" name="umlEClass"> - <type xmi:type="uml:Class" href="pathmap://ECORE_METAMODEL_LIBRARY/Ecore.uml#_SeWizcX_EduPJbEsMYXjUQ"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wvOuMCzXEeeKOdJYr-htag"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wvlTgCzXEeeKOdJYr-htag" value="1"/> - </ownedAttribute> - <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_vxKjcCzXEeeKOdJYr-htag" client="_dbFkACzXEeeKOdJYr-htag"> - <supplier xmi:type="uml:Interface" href="pathmap://EXPRESSIONS//expressions.uml#_P-MkYBVaEee_D4EhwjboOQ"/> - <contract xmi:type="uml:Interface" href="pathmap://EXPRESSIONS//expressions.uml#_P-MkYBVaEee_D4EhwjboOQ"/> - </interfaceRealization> + <generalization xmi:type="uml:Generalization" xmi:id="_9qH7oJKEEemc-6sEcrB3og" general="_yDtSIJKEEemc-6sEcrB3og"/> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_89wEECzYEeeKOdJYr-htag" name="IsKindOfExpression"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_HrIz0CzZEeeKOdJYr-htag" name="umlEClass"> - <type xmi:type="uml:Class" href="pathmap://ECORE_METAMODEL_LIBRARY/Ecore.uml#_SeWizcX_EduPJbEsMYXjUQ"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HrIz0SzZEeeKOdJYr-htag"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HrIz0izZEeeKOdJYr-htag" value="1"/> - </ownedAttribute> - <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_fi8WcCzZEeeKOdJYr-htag" client="_89wEECzYEeeKOdJYr-htag"> - <supplier xmi:type="uml:Interface" href="pathmap://EXPRESSIONS//expressions.uml#_P-MkYBVaEee_D4EhwjboOQ"/> - <contract xmi:type="uml:Interface" href="pathmap://EXPRESSIONS//expressions.uml#_P-MkYBVaEee_D4EhwjboOQ"/> - </interfaceRealization> + <generalization xmi:type="uml:Generalization" xmi:id="_9J1SAJKEEemc-6sEcrB3og" general="_yDtSIJKEEemc-6sEcrB3og"/> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_To5I8K8zEeemetdP4I8Ciw" name="IsTypeOfStereotypeExpression"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_ucH64K8zEeemetdP4I8Ciw" name="stereotypeQualifiedName"> + <generalization xmi:type="uml:Generalization" xmi:id="_vq2kYJKEEemc-6sEcrB3og" general="_xjq8oJKDEemc-6sEcrB3og"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_f3yHsK8zEeemetdP4I8Ciw" name="IsKindOfStereotypeExpression"> + <generalization xmi:type="uml:Generalization" xmi:id="_u8UDYJKEEemc-6sEcrB3og" general="_xjq8oJKDEemc-6sEcrB3og"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_h6WtQI6EEemT4f6zJmxUrQ" name="SingleStereotypeAttributeEqualityExpression"> + <ownedComment xmi:type="uml:Comment" xmi:id="_d3xMII6FEemT4f6zJmxUrQ" annotatedElement="_h6WtQI6EEemT4f6zJmxUrQ"> + <body>This expression allows to check equality between the current property value of the context object and the expected value. 
 +The evaluate method returns true, in case of equality and false otherwise.
 +If the propertyName or the stereotypeQualifiedName are not defined, the evalute methods retuns false.</body> + </ownedComment> + <generalization xmi:type="uml:Generalization" xmi:id="_wyAZsJKEEemc-6sEcrB3og" general="_xjq8oJKDEemc-6sEcrB3og"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_wgpBMI6EEemT4f6zJmxUrQ" name="expectedValue"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5UpjoK8zEeemetdP4I8Ciw"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5UytkK8zEeemetdP4I8Ciw" value="1"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_z4zP0I6EEemT4f6zJmxUrQ"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_ETqgAK9iEeexsdIvvO0f9g" name="profileURI"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_605fQI6EEemT4f6zJmxUrQ" name="propertyName"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6li10JEPEemZKIkUI2kHyA" source="http://www.eclipse.org/emf/2002/GenModel"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6li10ZEPEemZKIkUI2kHyA" key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/umlExpressions/StereotypeAttributeEqualityExpression/AttributeName"/> + </eAnnotations> + <ownedComment xmi:type="uml:Comment" xmi:id="_JdVvUI6FEemT4f6zJmxUrQ" annotatedElement="_605fQI6EEemT4f6zJmxUrQ"> + <body>The name of the stereotype property. 
 +The property must be single valued and typde with a PrimitiveTypes</body> + </ownedComment> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_I-6HIK9iEeexsdIvvO0f9g"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_I-6HIa9iEeexsdIvvO0f9g" value="1"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CYf0wJEQEemZKIkUI2kHyA"/> </ownedAttribute> - <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_QTxyAK9ZEeexsdIvvO0f9g" client="_To5I8K8zEeemetdP4I8Ciw"> - <supplier xmi:type="uml:Interface" href="pathmap://EXPRESSIONS//expressions.uml#_P-MkYBVaEee_D4EhwjboOQ"/> - <contract xmi:type="uml:Interface" href="pathmap://EXPRESSIONS//expressions.uml#_P-MkYBVaEee_D4EhwjboOQ"/> - </interfaceRealization> </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_f3yHsK8zEeemetdP4I8Ciw" name="IsKindOfStereotypeExpression"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_8u2ZoK8zEeemetdP4I8Ciw" name="stereotypeQualifiedName"> + <packagedElement xmi:type="uml:Class" xmi:id="_xjq8oJKDEemc-6sEcrB3og" name="AbstractStereotypeExpression" isAbstract="true"> + <ownedComment xmi:type="uml:Comment" xmi:id="_8xsUQJKDEemc-6sEcrB3og" annotatedElement="_xjq8oJKDEemc-6sEcrB3og"> + <body>Abstract Expression working on stereotype. This expression allows to represent a stereotype using its qualified name.</body> + </ownedComment> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2h_30JKDEemc-6sEcrB3og" name="stereotypeQualifiedName"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2h_30ZKDEemc-6sEcrB3og" source="http://www.eclipse.org/emf/2002/GenModel"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2h_30pKDEemc-6sEcrB3og" key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/umlExpressions/StereotypeExpression/StereotypeQualifiedName"/> + </eAnnotations> + <ownedComment xmi:type="uml:Comment" xmi:id="_2h_305KDEemc-6sEcrB3og" annotatedElement="_2h_30JKDEemc-6sEcrB3og"> + <body>The qualified name of the required stereotype.</body> + </ownedComment> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__VUsoK8zEeemetdP4I8Ciw"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__Vd2kK8zEeemetdP4I8Ciw" value="1"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2h_31JKDEemc-6sEcrB3og"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2h_31ZKDEemc-6sEcrB3og" value="1"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_KAjxYK9iEeexsdIvvO0f9g" name="profileURI"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2iEJQJKDEemc-6sEcrB3og" name="profileURI"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2iEJQZKDEemc-6sEcrB3og" source="http://www.eclipse.org/emf/2002/GenModel"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2iEJQpKDEemc-6sEcrB3og" key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/umlExpressions/StereotypeExpression/ProfileURI"/> + </eAnnotations> + <ownedComment xmi:type="uml:Comment" xmi:id="_2iEJQ5KDEemc-6sEcrB3og" annotatedElement="_2iEJQJKDEemc-6sEcrB3og"> + <body>The URI of the profile owning the stereotype.
 +The URI can be null or empty. In this case, we don't check the URI of the profile providing the Stereotype.</body> + </ownedComment> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LraJoK9iEeexsdIvvO0f9g"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LraJoa9iEeexsdIvvO0f9g" value="1"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2iEJRJKDEemc-6sEcrB3og"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2iEJRZKDEemc-6sEcrB3og" value="1"/> + </ownedAttribute> + <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_087-gJKDEemc-6sEcrB3og" client="_xjq8oJKDEemc-6sEcrB3og"> + <supplier xmi:type="uml:Interface" href="pathmap://EXPRESSIONS//expressions.uml#_P-MkYBVaEee_D4EhwjboOQ"/> + <contract xmi:type="uml:Interface" href="pathmap://EXPRESSIONS//expressions.uml#_P-MkYBVaEee_D4EhwjboOQ"/> + </interfaceRealization> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_yDtSIJKEEemc-6sEcrB3og" name="AbstractUMLEClassExpression" isAbstract="true"> + <ownedComment xmi:type="uml:Comment" xmi:id="_QAw7wJKFEemc-6sEcrB3og" annotatedElement="_yDtSIJKEEemc-6sEcrB3og"> + <body>This expression allows to represent a UML Metaclass (Ecore EClass).</body> + </ownedComment> + <ownedAttribute xmi:type="uml:Property" xmi:id="_CSw6sJKFEemc-6sEcrB3og" name="umlEClass"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CSw6sZKFEemc-6sEcrB3og" source="http://www.eclipse.org/emf/2002/GenModel"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CSw6spKFEemc-6sEcrB3og" key="propertyEditorFactory" value="http://www.eclipse.org/papyrus/umlExpressions/UMLEClassExpression/UMLEClass"/> + </eAnnotations> + <type xmi:type="uml:Class" href="pathmap://ECORE_METAMODEL_LIBRARY/Ecore.uml#_SeWizcX_EduPJbEsMYXjUQ"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CSw6s5KFEemc-6sEcrB3og"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CSxhwJKFEemc-6sEcrB3og" value="1"/> </ownedAttribute> - <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_RvOcUK9ZEeexsdIvvO0f9g" client="_f3yHsK8zEeemetdP4I8Ciw"> + <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_31BwgJKEEemc-6sEcrB3og" client="_yDtSIJKEEemc-6sEcrB3og"> <supplier xmi:type="uml:Interface" href="pathmap://EXPRESSIONS//expressions.uml#_P-MkYBVaEee_D4EhwjboOQ"/> <contract xmi:type="uml:Interface" href="pathmap://EXPRESSIONS//expressions.uml#_P-MkYBVaEee_D4EhwjboOQ"/> </interfaceRealization> diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/pom.xml b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/pom.xml index db325f077ca..bf47359da1b 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/pom.xml +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/pom.xml @@ -8,7 +8,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.expressions</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <description>Extension of the Papyrus EMF Expressions. It provides expressions dedicated to UML Element.</description> </project>
\ No newline at end of file diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/AbstractStereotypeExpression.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/AbstractStereotypeExpression.java new file mode 100755 index 00000000000..686efe57cdb --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/AbstractStereotypeExpression.java @@ -0,0 +1,91 @@ +/** + * 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.uml.expressions.umlexpressions; + +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Abstract Stereotype Expression</b></em>'. + * <!-- end-user-doc --> + * + * <!-- begin-model-doc --> + * Abstract Expression working on stereotype. This expression allows to represent a stereotype using its qualified name. + * <!-- end-model-doc --> + * + * <p> + * The following features are supported: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractStereotypeExpression#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li> + * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractStereotypeExpression#getProfileURI <em>Profile URI</em>}</li> + * </ul> + * + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getAbstractStereotypeExpression() + * @model abstract="true" + * @generated + */ +public interface AbstractStereotypeExpression extends IBooleanEObjectExpression { + /** + * Returns the value of the '<em><b>Stereotype Qualified Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * The qualified name of the required stereotype. + * <!-- end-model-doc --> + * @return the value of the '<em>Stereotype Qualified Name</em>' attribute. + * @see #setStereotypeQualifiedName(String) + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getAbstractStereotypeExpression_StereotypeQualifiedName() + * @model ordered="false" + * @generated + */ + String getStereotypeQualifiedName(); + + /** + * Sets the value of the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractStereotypeExpression#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Stereotype Qualified Name</em>' attribute. + * @see #getStereotypeQualifiedName() + * @generated + */ + void setStereotypeQualifiedName(String value); + + /** + * Returns the value of the '<em><b>Profile URI</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * The URI of the profile owning the stereotype. + * The URI can be null or empty. In this case, we don't check the URI of the profile providing the Stereotype. + * <!-- end-model-doc --> + * @return the value of the '<em>Profile URI</em>' attribute. + * @see #setProfileURI(String) + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getAbstractStereotypeExpression_ProfileURI() + * @model ordered="false" + * @generated + */ + String getProfileURI(); + + /** + * Sets the value of the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractStereotypeExpression#getProfileURI <em>Profile URI</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Profile URI</em>' attribute. + * @see #getProfileURI() + * @generated + */ + void setProfileURI(String value); + +} // AbstractStereotypeExpression diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/AbstractUMLEClassExpression.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/AbstractUMLEClassExpression.java new file mode 100755 index 00000000000..de3c1ff2d7b --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/AbstractUMLEClassExpression.java @@ -0,0 +1,67 @@ +/** + * 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.uml.expressions.umlexpressions; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Abstract UMLE Class Expression</b></em>'. + * <!-- end-user-doc --> + * + * <!-- begin-model-doc --> + * This expression allows to represent a UML Metaclass (Ecore EClass). + * <!-- end-model-doc --> + * + * <p> + * The following features are supported: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractUMLEClassExpression#getUmlEClass <em>Uml EClass</em>}</li> + * </ul> + * + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getAbstractUMLEClassExpression() + * @model abstract="true" + * @generated + */ +public interface AbstractUMLEClassExpression extends IBooleanEObjectExpression { + /** + * Returns the value of the '<em><b>Uml EClass</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Uml EClass</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Uml EClass</em>' reference. + * @see #setUmlEClass(EClass) + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getAbstractUMLEClassExpression_UmlEClass() + * @model ordered="false" + * @generated + */ + EClass getUmlEClass(); + + /** + * Sets the value of the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractUMLEClassExpression#getUmlEClass <em>Uml EClass</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Uml EClass</em>' reference. + * @see #getUmlEClass() + * @generated + */ + void setUmlEClass(EClass value); + +} // AbstractUMLEClassExpression diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/HasAppliedStereotypesExpression.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/HasAppliedStereotypesExpression.java index b99a88f1bce..e0e4a31b695 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/HasAppliedStereotypesExpression.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/HasAppliedStereotypesExpression.java @@ -1,16 +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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions; diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsKindOfExpression.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsKindOfExpression.java index 79e6f0fbac9..5dd2da2c812 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsKindOfExpression.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsKindOfExpression.java @@ -1,22 +1,18 @@ /** * 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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions; -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; /** * <!-- begin-user-doc --> @@ -30,42 +26,10 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObj * * <!-- end-model-doc --> * - * <p> - * The following features are supported: - * </p> - * <ul> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfExpression#getUmlEClass <em>Uml EClass</em>}</li> - * </ul> * * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getIsKindOfExpression() * @model * @generated */ -public interface IsKindOfExpression extends IBooleanEObjectExpression { - /** - * Returns the value of the '<em><b>Uml EClass</b></em>' reference. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Uml EClass</em>' reference isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Uml EClass</em>' reference. - * @see #setUmlEClass(EClass) - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getIsKindOfExpression_UmlEClass() - * @model ordered="false" - * @generated - */ - EClass getUmlEClass(); - - /** - * Sets the value of the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfExpression#getUmlEClass <em>Uml EClass</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Uml EClass</em>' reference. - * @see #getUmlEClass() - * @generated - */ - void setUmlEClass(EClass value); - +public interface IsKindOfExpression extends AbstractUMLEClassExpression { } // IsKindOfExpression diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsKindOfStereotypeExpression.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsKindOfStereotypeExpression.java index 93b7e4d4473..a0186881448 100644..100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsKindOfStereotypeExpression.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsKindOfStereotypeExpression.java @@ -1,20 +1,18 @@ /** * 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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions; -import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; /** * <!-- begin-user-doc --> @@ -27,69 +25,10 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObj * * <!-- end-model-doc --> * - * <p> - * The following features are supported: - * </p> - * <ul> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression#getProfileURI <em>Profile URI</em>}</li> - * </ul> * * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getIsKindOfStereotypeExpression() * @model * @generated */ -public interface IsKindOfStereotypeExpression extends IBooleanEObjectExpression { - /** - * Returns the value of the '<em><b>Stereotype Qualified Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Stereotype Qualified Name</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Stereotype Qualified Name</em>' attribute. - * @see #setStereotypeQualifiedName(String) - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getIsKindOfStereotypeExpression_StereotypeQualifiedName() - * @model ordered="false" - * @generated - */ - String getStereotypeQualifiedName(); - - /** - * Sets the value of the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Stereotype Qualified Name</em>' attribute. - * @see #getStereotypeQualifiedName() - * @generated - */ - void setStereotypeQualifiedName(String value); - - /** - * Returns the value of the '<em><b>Profile URI</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Profile URI</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Profile URI</em>' attribute. - * @see #setProfileURI(String) - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getIsKindOfStereotypeExpression_ProfileURI() - * @model ordered="false" - * @generated - */ - String getProfileURI(); - - /** - * Sets the value of the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression#getProfileURI <em>Profile URI</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Profile URI</em>' attribute. - * @see #getProfileURI() - * @generated - */ - void setProfileURI(String value); - +public interface IsKindOfStereotypeExpression extends AbstractStereotypeExpression { } // IsKindOfStereotypeExpression diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsStereotypedWithExpression.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsStereotypedWithExpression.java index 99fb796dd0d..6157c7e7099 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsStereotypedWithExpression.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsStereotypedWithExpression.java @@ -1,20 +1,18 @@ /** * 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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions; -import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; /** * <!-- begin-user-doc --> @@ -27,72 +25,10 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObj * URI profile field is not mandatory for the test. * <!-- end-model-doc --> * - * <p> - * The following features are supported: - * </p> - * <ul> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsStereotypedWithExpression#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsStereotypedWithExpression#getProfileURI <em>Profile URI</em>}</li> - * </ul> * * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getIsStereotypedWithExpression() * @model * @generated */ -public interface IsStereotypedWithExpression extends IBooleanEObjectExpression { - /** - * Returns the value of the '<em><b>Stereotype Qualified Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Stereotype Qualified Name</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * <!-- begin-model-doc --> - * The qualified name of the required stereotype. - * <!-- end-model-doc --> - * @return the value of the '<em>Stereotype Qualified Name</em>' attribute. - * @see #setStereotypeQualifiedName(String) - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getIsStereotypedWithExpression_StereotypeQualifiedName() - * @model ordered="false" - * @generated - */ - String getStereotypeQualifiedName(); - - /** - * Sets the value of the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsStereotypedWithExpression#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Stereotype Qualified Name</em>' attribute. - * @see #getStereotypeQualifiedName() - * @generated - */ - void setStereotypeQualifiedName(String value); - - /** - * Returns the value of the '<em><b>Profile URI</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * <!-- begin-model-doc --> - * The URI of the profile owning the stereotype. - * The URI can be null or empty. In this case, we don't check the URI of the profile providing the Stereotype. - * <!-- end-model-doc --> - * @return the value of the '<em>Profile URI</em>' attribute. - * @see #setProfileURI(String) - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getIsStereotypedWithExpression_ProfileURI() - * @model ordered="false" - * @generated - */ - String getProfileURI(); - - /** - * Sets the value of the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsStereotypedWithExpression#getProfileURI <em>Profile URI</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Profile URI</em>' attribute. - * @see #getProfileURI() - * @generated - */ - void setProfileURI(String value); - +public interface IsStereotypedWithExpression extends AbstractStereotypeExpression { } // IsStereotypedWithExpression diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsTypeOfExpression.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsTypeOfExpression.java index c6cb82cacde..3d97a0e5d60 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsTypeOfExpression.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsTypeOfExpression.java @@ -1,22 +1,18 @@ /** * 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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions; -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; /** * <!-- begin-user-doc --> @@ -30,42 +26,10 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObj * * <!-- end-model-doc --> * - * <p> - * The following features are supported: - * </p> - * <ul> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfExpression#getUmlEClass <em>Uml EClass</em>}</li> - * </ul> * * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getIsTypeOfExpression() * @model * @generated */ -public interface IsTypeOfExpression extends IBooleanEObjectExpression { - /** - * Returns the value of the '<em><b>Uml EClass</b></em>' reference. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Uml EClass</em>' reference isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Uml EClass</em>' reference. - * @see #setUmlEClass(EClass) - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getIsTypeOfExpression_UmlEClass() - * @model ordered="false" - * @generated - */ - EClass getUmlEClass(); - - /** - * Sets the value of the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfExpression#getUmlEClass <em>Uml EClass</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Uml EClass</em>' reference. - * @see #getUmlEClass() - * @generated - */ - void setUmlEClass(EClass value); - +public interface IsTypeOfExpression extends AbstractUMLEClassExpression { } // IsTypeOfExpression diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsTypeOfStereotypeExpression.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsTypeOfStereotypeExpression.java index e88b7604faa..d282052e163 100644..100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsTypeOfStereotypeExpression.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsTypeOfStereotypeExpression.java @@ -1,20 +1,18 @@ /** * 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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions; -import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; /** * <!-- begin-user-doc --> @@ -27,69 +25,10 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObj * * <!-- end-model-doc --> * - * <p> - * The following features are supported: - * </p> - * <ul> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression#getProfileURI <em>Profile URI</em>}</li> - * </ul> * * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getIsTypeOfStereotypeExpression() * @model * @generated */ -public interface IsTypeOfStereotypeExpression extends IBooleanEObjectExpression { - /** - * Returns the value of the '<em><b>Stereotype Qualified Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Stereotype Qualified Name</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Stereotype Qualified Name</em>' attribute. - * @see #setStereotypeQualifiedName(String) - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getIsTypeOfStereotypeExpression_StereotypeQualifiedName() - * @model ordered="false" - * @generated - */ - String getStereotypeQualifiedName(); - - /** - * Sets the value of the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Stereotype Qualified Name</em>' attribute. - * @see #getStereotypeQualifiedName() - * @generated - */ - void setStereotypeQualifiedName(String value); - - /** - * Returns the value of the '<em><b>Profile URI</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Profile URI</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Profile URI</em>' attribute. - * @see #setProfileURI(String) - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getIsTypeOfStereotypeExpression_ProfileURI() - * @model ordered="false" - * @generated - */ - String getProfileURI(); - - /** - * Sets the value of the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression#getProfileURI <em>Profile URI</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Profile URI</em>' attribute. - * @see #getProfileURI() - * @generated - */ - void setProfileURI(String value); - +public interface IsTypeOfStereotypeExpression extends AbstractStereotypeExpression { } // IsTypeOfStereotypeExpression diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/SingleStereotypeAttributeEqualityExpression.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/SingleStereotypeAttributeEqualityExpression.java new file mode 100755 index 00000000000..5bb9e80c5c4 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/SingleStereotypeAttributeEqualityExpression.java @@ -0,0 +1,93 @@ +/** + * 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.uml.expressions.umlexpressions; + + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Single Stereotype Attribute Equality Expression</b></em>'. + * <!-- end-user-doc --> + * + * <!-- begin-model-doc --> + * This expression allows to check equality between the current property value of the context object and the expected value. + * The evaluate method returns true, in case of equality and false otherwise. + * If the propertyName or the stereotypeQualifiedName are not defined, the evalute methods retuns false. + * <!-- end-model-doc --> + * + * <p> + * The following features are supported: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression#getExpectedValue <em>Expected Value</em>}</li> + * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression#getPropertyName <em>Property Name</em>}</li> + * </ul> + * + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getSingleStereotypeAttributeEqualityExpression() + * @model + * @generated + */ +public interface SingleStereotypeAttributeEqualityExpression extends AbstractStereotypeExpression { + /** + * Returns the value of the '<em><b>Expected Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Expected Value</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Expected Value</em>' attribute. + * @see #setExpectedValue(String) + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getSingleStereotypeAttributeEqualityExpression_ExpectedValue() + * @model ordered="false" + * @generated + */ + String getExpectedValue(); + + /** + * Sets the value of the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression#getExpectedValue <em>Expected Value</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Expected Value</em>' attribute. + * @see #getExpectedValue() + * @generated + */ + void setExpectedValue(String value); + + /** + * Returns the value of the '<em><b>Property Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * The name of the stereotype property. + * The property must be single valued and typde with a PrimitiveTypes + * <!-- end-model-doc --> + * @return the value of the '<em>Property Name</em>' attribute. + * @see #setPropertyName(String) + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage#getSingleStereotypeAttributeEqualityExpression_PropertyName() + * @model ordered="false" + * @generated + */ + String getPropertyName(); + + /** + * Sets the value of the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression#getPropertyName <em>Property Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Property Name</em>' attribute. + * @see #getPropertyName() + * @generated + */ + void setPropertyName(String value); + +} // SingleStereotypeAttributeEqualityExpression diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/UMLExpressionsFactory.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/UMLExpressionsFactory.java index d31098b40c4..74730a07307 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/UMLExpressionsFactory.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/UMLExpressionsFactory.java @@ -1,16 +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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions; @@ -88,6 +87,15 @@ public interface UMLExpressionsFactory extends EFactory { IsTypeOfStereotypeExpression createIsTypeOfStereotypeExpression(); /** + * Returns a new object of class '<em>Single Stereotype Attribute Equality Expression</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Single Stereotype Attribute Equality Expression</em>'. + * @generated + */ + SingleStereotypeAttributeEqualityExpression createSingleStereotypeAttributeEqualityExpression(); + + /** * Returns the package supported by this factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/UMLExpressionsPackage.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/UMLExpressionsPackage.java index b0b24928f5e..8427d3ee81a 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/UMLExpressionsPackage.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/UMLExpressionsPackage.java @@ -1,16 +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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions; @@ -18,6 +17,7 @@ import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; + import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; /** @@ -32,6 +32,9 @@ import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpre * <li>and each data type</li> * </ul> * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * A string representing the expected value. + * <!-- end-model-doc --> * @see org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsFactory * @model kind="package" * annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='UMLExpressions'" @@ -71,6 +74,79 @@ public interface UMLExpressionsPackage extends EPackage { UMLExpressionsPackage eINSTANCE = org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl.init(); /** + * The meta object id for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.AbstractStereotypeExpressionImpl <em>Abstract Stereotype Expression</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.AbstractStereotypeExpressionImpl + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getAbstractStereotypeExpression() + * @generated + */ + int ABSTRACT_STEREOTYPE_EXPRESSION = 1; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_STEREOTYPE_EXPRESSION__NAME = BooleanExpressionsPackage.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_STEREOTYPE_EXPRESSION__DESCRIPTION = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION__DESCRIPTION; + + /** + * The feature id for the '<em><b>Stereotype Qualified Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Profile URI</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_STEREOTYPE_EXPRESSION__PROFILE_URI = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1; + + /** + * The number of structural features of the '<em>Abstract Stereotype Expression</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_STEREOTYPE_EXPRESSION_FEATURE_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 2; + + /** + * The operation id for the '<em>Evaluate</em>' operation. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_STEREOTYPE_EXPRESSION___EVALUATE__OBJECT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT; + + /** + * The number of operations of the '<em>Abstract Stereotype Expression</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_STEREOTYPE_EXPRESSION_OPERATION_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsStereotypedWithExpressionImpl <em>Is Stereotyped With Expression</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -87,7 +163,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_STEREOTYPED_WITH_EXPRESSION__NAME = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION__NAME; + int IS_STEREOTYPED_WITH_EXPRESSION__NAME = ABSTRACT_STEREOTYPE_EXPRESSION__NAME; /** * The feature id for the '<em><b>Description</b></em>' attribute. @@ -96,7 +172,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_STEREOTYPED_WITH_EXPRESSION__DESCRIPTION = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION__DESCRIPTION; + int IS_STEREOTYPED_WITH_EXPRESSION__DESCRIPTION = ABSTRACT_STEREOTYPE_EXPRESSION__DESCRIPTION; /** * The feature id for the '<em><b>Stereotype Qualified Name</b></em>' attribute. @@ -105,7 +181,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_STEREOTYPED_WITH_EXPRESSION__STEREOTYPE_QUALIFIED_NAME = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 0; + int IS_STEREOTYPED_WITH_EXPRESSION__STEREOTYPE_QUALIFIED_NAME = ABSTRACT_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME; /** * The feature id for the '<em><b>Profile URI</b></em>' attribute. @@ -114,7 +190,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_STEREOTYPED_WITH_EXPRESSION__PROFILE_URI = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1; + int IS_STEREOTYPED_WITH_EXPRESSION__PROFILE_URI = ABSTRACT_STEREOTYPE_EXPRESSION__PROFILE_URI; /** * The number of structural features of the '<em>Is Stereotyped With Expression</em>' class. @@ -123,7 +199,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_STEREOTYPED_WITH_EXPRESSION_FEATURE_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 2; + int IS_STEREOTYPED_WITH_EXPRESSION_FEATURE_COUNT = ABSTRACT_STEREOTYPE_EXPRESSION_FEATURE_COUNT + 0; /** * The operation id for the '<em>Evaluate</em>' operation. @@ -132,7 +208,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_STEREOTYPED_WITH_EXPRESSION___EVALUATE__OBJECT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT; + int IS_STEREOTYPED_WITH_EXPRESSION___EVALUATE__OBJECT = ABSTRACT_STEREOTYPE_EXPRESSION___EVALUATE__OBJECT; /** * The number of operations of the '<em>Is Stereotyped With Expression</em>' class. @@ -141,8 +217,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_STEREOTYPED_WITH_EXPRESSION_OPERATION_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; - + int IS_STEREOTYPED_WITH_EXPRESSION_OPERATION_COUNT = ABSTRACT_STEREOTYPE_EXPRESSION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.HasAppliedStereotypesExpressionImpl <em>Has Applied Stereotypes Expression</em>}' class. @@ -152,7 +227,7 @@ public interface UMLExpressionsPackage extends EPackage { * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getHasAppliedStereotypesExpression() * @generated */ - int HAS_APPLIED_STEREOTYPES_EXPRESSION = 1; + int HAS_APPLIED_STEREOTYPES_EXPRESSION = 2; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -199,6 +274,69 @@ public interface UMLExpressionsPackage extends EPackage { */ int HAS_APPLIED_STEREOTYPES_EXPRESSION_OPERATION_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; + /** + * The meta object id for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.AbstractUMLEClassExpressionImpl <em>Abstract UMLE Class Expression</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.AbstractUMLEClassExpressionImpl + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getAbstractUMLEClassExpression() + * @generated + */ + int ABSTRACT_UMLE_CLASS_EXPRESSION = 4; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_UMLE_CLASS_EXPRESSION__NAME = BooleanExpressionsPackage.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_UMLE_CLASS_EXPRESSION__DESCRIPTION = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION__DESCRIPTION; + + /** + * The feature id for the '<em><b>Uml EClass</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_UMLE_CLASS_EXPRESSION__UML_ECLASS = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>Abstract UMLE Class Expression</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_UMLE_CLASS_EXPRESSION_FEATURE_COUNT = BooleanExpressionsPackage.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_UMLE_CLASS_EXPRESSION___EVALUATE__OBJECT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT; + + /** + * The number of operations of the '<em>Abstract UMLE Class Expression</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_UMLE_CLASS_EXPRESSION_OPERATION_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsTypeOfExpressionImpl <em>Is Type Of Expression</em>}' class. @@ -208,7 +346,7 @@ public interface UMLExpressionsPackage extends EPackage { * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getIsTypeOfExpression() * @generated */ - int IS_TYPE_OF_EXPRESSION = 2; + int IS_TYPE_OF_EXPRESSION = 3; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -217,7 +355,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_TYPE_OF_EXPRESSION__NAME = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION__NAME; + int IS_TYPE_OF_EXPRESSION__NAME = ABSTRACT_UMLE_CLASS_EXPRESSION__NAME; /** * The feature id for the '<em><b>Description</b></em>' attribute. @@ -226,7 +364,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_TYPE_OF_EXPRESSION__DESCRIPTION = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION__DESCRIPTION; + int IS_TYPE_OF_EXPRESSION__DESCRIPTION = ABSTRACT_UMLE_CLASS_EXPRESSION__DESCRIPTION; /** * The feature id for the '<em><b>Uml EClass</b></em>' reference. @@ -235,7 +373,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_TYPE_OF_EXPRESSION__UML_ECLASS = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 0; + int IS_TYPE_OF_EXPRESSION__UML_ECLASS = ABSTRACT_UMLE_CLASS_EXPRESSION__UML_ECLASS; /** * The number of structural features of the '<em>Is Type Of Expression</em>' class. @@ -244,7 +382,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_TYPE_OF_EXPRESSION_FEATURE_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1; + int IS_TYPE_OF_EXPRESSION_FEATURE_COUNT = ABSTRACT_UMLE_CLASS_EXPRESSION_FEATURE_COUNT + 0; /** * The operation id for the '<em>Evaluate</em>' operation. @@ -253,7 +391,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_TYPE_OF_EXPRESSION___EVALUATE__OBJECT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT; + int IS_TYPE_OF_EXPRESSION___EVALUATE__OBJECT = ABSTRACT_UMLE_CLASS_EXPRESSION___EVALUATE__OBJECT; /** * The number of operations of the '<em>Is Type Of Expression</em>' class. @@ -262,7 +400,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_TYPE_OF_EXPRESSION_OPERATION_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; + int IS_TYPE_OF_EXPRESSION_OPERATION_COUNT = ABSTRACT_UMLE_CLASS_EXPRESSION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfExpressionImpl <em>Is Kind Of Expression</em>}' class. @@ -272,7 +410,7 @@ public interface UMLExpressionsPackage extends EPackage { * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getIsKindOfExpression() * @generated */ - int IS_KIND_OF_EXPRESSION = 3; + int IS_KIND_OF_EXPRESSION = 5; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -281,7 +419,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_KIND_OF_EXPRESSION__NAME = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION__NAME; + int IS_KIND_OF_EXPRESSION__NAME = ABSTRACT_UMLE_CLASS_EXPRESSION__NAME; /** * The feature id for the '<em><b>Description</b></em>' attribute. @@ -290,7 +428,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_KIND_OF_EXPRESSION__DESCRIPTION = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION__DESCRIPTION; + int IS_KIND_OF_EXPRESSION__DESCRIPTION = ABSTRACT_UMLE_CLASS_EXPRESSION__DESCRIPTION; /** * The feature id for the '<em><b>Uml EClass</b></em>' reference. @@ -299,7 +437,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_KIND_OF_EXPRESSION__UML_ECLASS = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 0; + int IS_KIND_OF_EXPRESSION__UML_ECLASS = ABSTRACT_UMLE_CLASS_EXPRESSION__UML_ECLASS; /** * The number of structural features of the '<em>Is Kind Of Expression</em>' class. @@ -308,7 +446,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_KIND_OF_EXPRESSION_FEATURE_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1; + int IS_KIND_OF_EXPRESSION_FEATURE_COUNT = ABSTRACT_UMLE_CLASS_EXPRESSION_FEATURE_COUNT + 0; /** * The operation id for the '<em>Evaluate</em>' operation. @@ -317,7 +455,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_KIND_OF_EXPRESSION___EVALUATE__OBJECT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT; + int IS_KIND_OF_EXPRESSION___EVALUATE__OBJECT = ABSTRACT_UMLE_CLASS_EXPRESSION___EVALUATE__OBJECT; /** * The number of operations of the '<em>Is Kind Of Expression</em>' class. @@ -326,7 +464,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_KIND_OF_EXPRESSION_OPERATION_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; + int IS_KIND_OF_EXPRESSION_OPERATION_COUNT = ABSTRACT_UMLE_CLASS_EXPRESSION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfStereotypeExpressionImpl <em>Is Kind Of Stereotype Expression</em>}' class. @@ -336,7 +474,7 @@ public interface UMLExpressionsPackage extends EPackage { * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getIsKindOfStereotypeExpression() * @generated */ - int IS_KIND_OF_STEREOTYPE_EXPRESSION = 4; + int IS_KIND_OF_STEREOTYPE_EXPRESSION = 6; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -345,7 +483,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_KIND_OF_STEREOTYPE_EXPRESSION__NAME = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION__NAME; + int IS_KIND_OF_STEREOTYPE_EXPRESSION__NAME = ABSTRACT_STEREOTYPE_EXPRESSION__NAME; /** * The feature id for the '<em><b>Description</b></em>' attribute. @@ -354,7 +492,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_KIND_OF_STEREOTYPE_EXPRESSION__DESCRIPTION = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION__DESCRIPTION; + int IS_KIND_OF_STEREOTYPE_EXPRESSION__DESCRIPTION = ABSTRACT_STEREOTYPE_EXPRESSION__DESCRIPTION; /** * The feature id for the '<em><b>Stereotype Qualified Name</b></em>' attribute. @@ -363,7 +501,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_KIND_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 0; + int IS_KIND_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME = ABSTRACT_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME; /** * The feature id for the '<em><b>Profile URI</b></em>' attribute. @@ -372,7 +510,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_KIND_OF_STEREOTYPE_EXPRESSION__PROFILE_URI = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1; + int IS_KIND_OF_STEREOTYPE_EXPRESSION__PROFILE_URI = ABSTRACT_STEREOTYPE_EXPRESSION__PROFILE_URI; /** * The number of structural features of the '<em>Is Kind Of Stereotype Expression</em>' class. @@ -381,7 +519,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_KIND_OF_STEREOTYPE_EXPRESSION_FEATURE_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 2; + int IS_KIND_OF_STEREOTYPE_EXPRESSION_FEATURE_COUNT = ABSTRACT_STEREOTYPE_EXPRESSION_FEATURE_COUNT + 0; /** * The operation id for the '<em>Evaluate</em>' operation. @@ -390,7 +528,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_KIND_OF_STEREOTYPE_EXPRESSION___EVALUATE__OBJECT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT; + int IS_KIND_OF_STEREOTYPE_EXPRESSION___EVALUATE__OBJECT = ABSTRACT_STEREOTYPE_EXPRESSION___EVALUATE__OBJECT; /** * The number of operations of the '<em>Is Kind Of Stereotype Expression</em>' class. @@ -399,7 +537,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_KIND_OF_STEREOTYPE_EXPRESSION_OPERATION_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; + int IS_KIND_OF_STEREOTYPE_EXPRESSION_OPERATION_COUNT = ABSTRACT_STEREOTYPE_EXPRESSION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsTypeOfStereotypeExpressionImpl <em>Is Type Of Stereotype Expression</em>}' class. @@ -409,7 +547,7 @@ public interface UMLExpressionsPackage extends EPackage { * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getIsTypeOfStereotypeExpression() * @generated */ - int IS_TYPE_OF_STEREOTYPE_EXPRESSION = 5; + int IS_TYPE_OF_STEREOTYPE_EXPRESSION = 7; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -418,7 +556,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_TYPE_OF_STEREOTYPE_EXPRESSION__NAME = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION__NAME; + int IS_TYPE_OF_STEREOTYPE_EXPRESSION__NAME = ABSTRACT_STEREOTYPE_EXPRESSION__NAME; /** * The feature id for the '<em><b>Description</b></em>' attribute. @@ -427,7 +565,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_TYPE_OF_STEREOTYPE_EXPRESSION__DESCRIPTION = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION__DESCRIPTION; + int IS_TYPE_OF_STEREOTYPE_EXPRESSION__DESCRIPTION = ABSTRACT_STEREOTYPE_EXPRESSION__DESCRIPTION; /** * The feature id for the '<em><b>Stereotype Qualified Name</b></em>' attribute. @@ -436,7 +574,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_TYPE_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 0; + int IS_TYPE_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME = ABSTRACT_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME; /** * The feature id for the '<em><b>Profile URI</b></em>' attribute. @@ -445,7 +583,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_TYPE_OF_STEREOTYPE_EXPRESSION__PROFILE_URI = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1; + int IS_TYPE_OF_STEREOTYPE_EXPRESSION__PROFILE_URI = ABSTRACT_STEREOTYPE_EXPRESSION__PROFILE_URI; /** * The number of structural features of the '<em>Is Type Of Stereotype Expression</em>' class. @@ -454,7 +592,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_TYPE_OF_STEREOTYPE_EXPRESSION_FEATURE_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 2; + int IS_TYPE_OF_STEREOTYPE_EXPRESSION_FEATURE_COUNT = ABSTRACT_STEREOTYPE_EXPRESSION_FEATURE_COUNT + 0; /** * The operation id for the '<em>Evaluate</em>' operation. @@ -463,7 +601,7 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_TYPE_OF_STEREOTYPE_EXPRESSION___EVALUATE__OBJECT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT; + int IS_TYPE_OF_STEREOTYPE_EXPRESSION___EVALUATE__OBJECT = ABSTRACT_STEREOTYPE_EXPRESSION___EVALUATE__OBJECT; /** * The number of operations of the '<em>Is Type Of Stereotype Expression</em>' class. @@ -472,7 +610,99 @@ public interface UMLExpressionsPackage extends EPackage { * @generated * @ordered */ - int IS_TYPE_OF_STEREOTYPE_EXPRESSION_OPERATION_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0; + int IS_TYPE_OF_STEREOTYPE_EXPRESSION_OPERATION_COUNT = ABSTRACT_STEREOTYPE_EXPRESSION_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.SingleStereotypeAttributeEqualityExpressionImpl <em>Single Stereotype Attribute Equality Expression</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.SingleStereotypeAttributeEqualityExpressionImpl + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getSingleStereotypeAttributeEqualityExpression() + * @generated + */ + int SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION = 8; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__NAME = ABSTRACT_STEREOTYPE_EXPRESSION__NAME; + + /** + * The feature id for the '<em><b>Description</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__DESCRIPTION = ABSTRACT_STEREOTYPE_EXPRESSION__DESCRIPTION; + + /** + * The feature id for the '<em><b>Stereotype Qualified Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__STEREOTYPE_QUALIFIED_NAME = ABSTRACT_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME; + + /** + * The feature id for the '<em><b>Profile URI</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__PROFILE_URI = ABSTRACT_STEREOTYPE_EXPRESSION__PROFILE_URI; + + /** + * The feature id for the '<em><b>Expected Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__EXPECTED_VALUE = ABSTRACT_STEREOTYPE_EXPRESSION_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Property Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__PROPERTY_NAME = ABSTRACT_STEREOTYPE_EXPRESSION_FEATURE_COUNT + 1; + + /** + * The number of structural features of the '<em>Single Stereotype Attribute Equality Expression</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION_FEATURE_COUNT = ABSTRACT_STEREOTYPE_EXPRESSION_FEATURE_COUNT + 2; + + /** + * The operation id for the '<em>Evaluate</em>' operation. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION___EVALUATE__OBJECT = ABSTRACT_STEREOTYPE_EXPRESSION___EVALUATE__OBJECT; + + /** + * The number of operations of the '<em>Single Stereotype Attribute Equality Expression</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION_OPERATION_COUNT = ABSTRACT_STEREOTYPE_EXPRESSION_OPERATION_COUNT + 0; + /** * Returns the meta object for class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsStereotypedWithExpression <em>Is Stereotyped With Expression</em>}'. @@ -485,26 +715,36 @@ public interface UMLExpressionsPackage extends EPackage { EClass getIsStereotypedWithExpression(); /** - * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsStereotypedWithExpression#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}'. + * Returns the meta object for class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractStereotypeExpression <em>Abstract Stereotype Expression</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Abstract Stereotype Expression</em>'. + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractStereotypeExpression + * @generated + */ + EClass getAbstractStereotypeExpression(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractStereotypeExpression#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Stereotype Qualified Name</em>'. - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.IsStereotypedWithExpression#getStereotypeQualifiedName() - * @see #getIsStereotypedWithExpression() + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractStereotypeExpression#getStereotypeQualifiedName() + * @see #getAbstractStereotypeExpression() * @generated */ - EAttribute getIsStereotypedWithExpression_StereotypeQualifiedName(); + EAttribute getAbstractStereotypeExpression_StereotypeQualifiedName(); /** - * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsStereotypedWithExpression#getProfileURI <em>Profile URI</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractStereotypeExpression#getProfileURI <em>Profile URI</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Profile URI</em>'. - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.IsStereotypedWithExpression#getProfileURI() - * @see #getIsStereotypedWithExpression() + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractStereotypeExpression#getProfileURI() + * @see #getAbstractStereotypeExpression() * @generated */ - EAttribute getIsStereotypedWithExpression_ProfileURI(); + EAttribute getAbstractStereotypeExpression_ProfileURI(); /** * Returns the meta object for class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.HasAppliedStereotypesExpression <em>Has Applied Stereotypes Expression</em>}'. @@ -527,36 +767,35 @@ public interface UMLExpressionsPackage extends EPackage { EClass getIsTypeOfExpression(); /** - * Returns the meta object for the reference '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfExpression#getUmlEClass <em>Uml EClass</em>}'. + * Returns the meta object for class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractUMLEClassExpression <em>Abstract UMLE Class Expression</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Uml EClass</em>'. - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfExpression#getUmlEClass() - * @see #getIsTypeOfExpression() + * @return the meta object for class '<em>Abstract UMLE Class Expression</em>'. + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractUMLEClassExpression * @generated */ - EReference getIsTypeOfExpression_UmlEClass(); + EClass getAbstractUMLEClassExpression(); /** - * Returns the meta object for class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfExpression <em>Is Kind Of Expression</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractUMLEClassExpression#getUmlEClass <em>Uml EClass</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Is Kind Of Expression</em>'. - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfExpression + * @return the meta object for the reference '<em>Uml EClass</em>'. + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractUMLEClassExpression#getUmlEClass() + * @see #getAbstractUMLEClassExpression() * @generated */ - EClass getIsKindOfExpression(); + EReference getAbstractUMLEClassExpression_UmlEClass(); /** - * Returns the meta object for the reference '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfExpression#getUmlEClass <em>Uml EClass</em>}'. + * Returns the meta object for class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfExpression <em>Is Kind Of Expression</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Uml EClass</em>'. - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfExpression#getUmlEClass() - * @see #getIsKindOfExpression() + * @return the meta object for class '<em>Is Kind Of Expression</em>'. + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfExpression * @generated */ - EReference getIsKindOfExpression_UmlEClass(); + EClass getIsKindOfExpression(); /** * Returns the meta object for class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression <em>Is Kind Of Stereotype Expression</em>}'. @@ -569,58 +808,46 @@ public interface UMLExpressionsPackage extends EPackage { EClass getIsKindOfStereotypeExpression(); /** - * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Stereotype Qualified Name</em>'. - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression#getStereotypeQualifiedName() - * @see #getIsKindOfStereotypeExpression() - * @generated - */ - EAttribute getIsKindOfStereotypeExpression_StereotypeQualifiedName(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression#getProfileURI <em>Profile URI</em>}'. + * Returns the meta object for class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression <em>Is Type Of Stereotype Expression</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Profile URI</em>'. - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression#getProfileURI() - * @see #getIsKindOfStereotypeExpression() + * @return the meta object for class '<em>Is Type Of Stereotype Expression</em>'. + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression * @generated */ - EAttribute getIsKindOfStereotypeExpression_ProfileURI(); + EClass getIsTypeOfStereotypeExpression(); /** - * Returns the meta object for class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression <em>Is Type Of Stereotype Expression</em>}'. + * Returns the meta object for class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression <em>Single Stereotype Attribute Equality Expression</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Is Type Of Stereotype Expression</em>'. - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression + * @return the meta object for class '<em>Single Stereotype Attribute Equality Expression</em>'. + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression * @generated */ - EClass getIsTypeOfStereotypeExpression(); + EClass getSingleStereotypeAttributeEqualityExpression(); /** - * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression#getExpectedValue <em>Expected Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Stereotype Qualified Name</em>'. - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression#getStereotypeQualifiedName() - * @see #getIsTypeOfStereotypeExpression() + * @return the meta object for the attribute '<em>Expected Value</em>'. + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression#getExpectedValue() + * @see #getSingleStereotypeAttributeEqualityExpression() * @generated */ - EAttribute getIsTypeOfStereotypeExpression_StereotypeQualifiedName(); + EAttribute getSingleStereotypeAttributeEqualityExpression_ExpectedValue(); /** - * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression#getProfileURI <em>Profile URI</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression#getPropertyName <em>Property Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Profile URI</em>'. - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression#getProfileURI() - * @see #getIsTypeOfStereotypeExpression() + * @return the meta object for the attribute '<em>Property Name</em>'. + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression#getPropertyName() + * @see #getSingleStereotypeAttributeEqualityExpression() * @generated */ - EAttribute getIsTypeOfStereotypeExpression_ProfileURI(); + EAttribute getSingleStereotypeAttributeEqualityExpression_PropertyName(); /** * Returns the factory that creates the instances of the model. @@ -656,12 +883,22 @@ public interface UMLExpressionsPackage extends EPackage { EClass IS_STEREOTYPED_WITH_EXPRESSION = eINSTANCE.getIsStereotypedWithExpression(); /** + * The meta object literal for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.AbstractStereotypeExpressionImpl <em>Abstract Stereotype Expression</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.AbstractStereotypeExpressionImpl + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getAbstractStereotypeExpression() + * @generated + */ + EClass ABSTRACT_STEREOTYPE_EXPRESSION = eINSTANCE.getAbstractStereotypeExpression(); + + /** * The meta object literal for the '<em><b>Stereotype Qualified Name</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute IS_STEREOTYPED_WITH_EXPRESSION__STEREOTYPE_QUALIFIED_NAME = eINSTANCE.getIsStereotypedWithExpression_StereotypeQualifiedName(); + EAttribute ABSTRACT_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME = eINSTANCE.getAbstractStereotypeExpression_StereotypeQualifiedName(); /** * The meta object literal for the '<em><b>Profile URI</b></em>' attribute feature. @@ -669,7 +906,7 @@ public interface UMLExpressionsPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - EAttribute IS_STEREOTYPED_WITH_EXPRESSION__PROFILE_URI = eINSTANCE.getIsStereotypedWithExpression_ProfileURI(); + EAttribute ABSTRACT_STEREOTYPE_EXPRESSION__PROFILE_URI = eINSTANCE.getAbstractStereotypeExpression_ProfileURI(); /** * The meta object literal for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.HasAppliedStereotypesExpressionImpl <em>Has Applied Stereotypes Expression</em>}' class. @@ -692,30 +929,32 @@ public interface UMLExpressionsPackage extends EPackage { EClass IS_TYPE_OF_EXPRESSION = eINSTANCE.getIsTypeOfExpression(); /** - * The meta object literal for the '<em><b>Uml EClass</b></em>' reference feature. + * The meta object literal for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.AbstractUMLEClassExpressionImpl <em>Abstract UMLE Class Expression</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.AbstractUMLEClassExpressionImpl + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getAbstractUMLEClassExpression() * @generated */ - EReference IS_TYPE_OF_EXPRESSION__UML_ECLASS = eINSTANCE.getIsTypeOfExpression_UmlEClass(); + EClass ABSTRACT_UMLE_CLASS_EXPRESSION = eINSTANCE.getAbstractUMLEClassExpression(); /** - * The meta object literal for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfExpressionImpl <em>Is Kind Of Expression</em>}' class. + * The meta object literal for the '<em><b>Uml EClass</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfExpressionImpl - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getIsKindOfExpression() * @generated */ - EClass IS_KIND_OF_EXPRESSION = eINSTANCE.getIsKindOfExpression(); + EReference ABSTRACT_UMLE_CLASS_EXPRESSION__UML_ECLASS = eINSTANCE.getAbstractUMLEClassExpression_UmlEClass(); /** - * The meta object literal for the '<em><b>Uml EClass</b></em>' reference feature. + * The meta object literal for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfExpressionImpl <em>Is Kind Of Expression</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfExpressionImpl + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getIsKindOfExpression() * @generated */ - EReference IS_KIND_OF_EXPRESSION__UML_ECLASS = eINSTANCE.getIsKindOfExpression_UmlEClass(); + EClass IS_KIND_OF_EXPRESSION = eINSTANCE.getIsKindOfExpression(); /** * The meta object literal for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfStereotypeExpressionImpl <em>Is Kind Of Stereotype Expression</em>}' class. @@ -728,46 +967,40 @@ public interface UMLExpressionsPackage extends EPackage { EClass IS_KIND_OF_STEREOTYPE_EXPRESSION = eINSTANCE.getIsKindOfStereotypeExpression(); /** - * The meta object literal for the '<em><b>Stereotype Qualified Name</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute IS_KIND_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME = eINSTANCE.getIsKindOfStereotypeExpression_StereotypeQualifiedName(); - - /** - * The meta object literal for the '<em><b>Profile URI</b></em>' attribute feature. + * The meta object literal for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsTypeOfStereotypeExpressionImpl <em>Is Type Of Stereotype Expression</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsTypeOfStereotypeExpressionImpl + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getIsTypeOfStereotypeExpression() * @generated */ - EAttribute IS_KIND_OF_STEREOTYPE_EXPRESSION__PROFILE_URI = eINSTANCE.getIsKindOfStereotypeExpression_ProfileURI(); + EClass IS_TYPE_OF_STEREOTYPE_EXPRESSION = eINSTANCE.getIsTypeOfStereotypeExpression(); /** - * The meta object literal for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsTypeOfStereotypeExpressionImpl <em>Is Type Of Stereotype Expression</em>}' class. + * The meta object literal for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.SingleStereotypeAttributeEqualityExpressionImpl <em>Single Stereotype Attribute Equality Expression</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsTypeOfStereotypeExpressionImpl - * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getIsTypeOfStereotypeExpression() + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.SingleStereotypeAttributeEqualityExpressionImpl + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getSingleStereotypeAttributeEqualityExpression() * @generated */ - EClass IS_TYPE_OF_STEREOTYPE_EXPRESSION = eINSTANCE.getIsTypeOfStereotypeExpression(); + EClass SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION = eINSTANCE.getSingleStereotypeAttributeEqualityExpression(); /** - * The meta object literal for the '<em><b>Stereotype Qualified Name</b></em>' attribute feature. + * The meta object literal for the '<em><b>Expected Value</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute IS_TYPE_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME = eINSTANCE.getIsTypeOfStereotypeExpression_StereotypeQualifiedName(); + EAttribute SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__EXPECTED_VALUE = eINSTANCE.getSingleStereotypeAttributeEqualityExpression_ExpectedValue(); /** - * The meta object literal for the '<em><b>Profile URI</b></em>' attribute feature. + * The meta object literal for the '<em><b>Property Name</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute IS_TYPE_OF_STEREOTYPE_EXPRESSION__PROFILE_URI = eINSTANCE.getIsTypeOfStereotypeExpression_ProfileURI(); + EAttribute SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__PROPERTY_NAME = eINSTANCE.getSingleStereotypeAttributeEqualityExpression_PropertyName(); } diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/AbstractStereotypeExpressionImpl.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/AbstractStereotypeExpressionImpl.java new file mode 100755 index 00000000000..6390bc0941a --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/AbstractStereotypeExpressionImpl.java @@ -0,0 +1,374 @@ +/** + * 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.uml.expressions.umlexpressions.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.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractStereotypeExpression; +import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Abstract Stereotype Expression</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.AbstractStereotypeExpressionImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.AbstractStereotypeExpressionImpl#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.AbstractStereotypeExpressionImpl#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li> + * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.AbstractStereotypeExpressionImpl#getProfileURI <em>Profile URI</em>}</li> + * </ul> + * + * @generated + */ +public abstract class AbstractStereotypeExpressionImpl extends MinimalEObjectImpl.Container implements AbstractStereotypeExpression { + /** + * 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 default value of the '{@link #getStereotypeQualifiedName() <em>Stereotype Qualified Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getStereotypeQualifiedName() + * @generated + * @ordered + */ + protected static final String STEREOTYPE_QUALIFIED_NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getStereotypeQualifiedName() <em>Stereotype Qualified Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getStereotypeQualifiedName() + * @generated + * @ordered + */ + protected String stereotypeQualifiedName = STEREOTYPE_QUALIFIED_NAME_EDEFAULT; + + /** + * The default value of the '{@link #getProfileURI() <em>Profile URI</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getProfileURI() + * @generated + * @ordered + */ + protected static final String PROFILE_URI_EDEFAULT = null; + + /** + * The cached value of the '{@link #getProfileURI() <em>Profile URI</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getProfileURI() + * @generated + * @ordered + */ + protected String profileURI = PROFILE_URI_EDEFAULT; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected AbstractStereotypeExpressionImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return UMLExpressionsPackage.Literals.ABSTRACT_STEREOTYPE_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, UMLExpressionsPackage.ABSTRACT_STEREOTYPE_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, UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__DESCRIPTION, oldDescription, description)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getStereotypeQualifiedName() { + return stereotypeQualifiedName; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setStereotypeQualifiedName(String newStereotypeQualifiedName) { + String oldStereotypeQualifiedName = stereotypeQualifiedName; + stereotypeQualifiedName = newStereotypeQualifiedName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME, oldStereotypeQualifiedName, stereotypeQualifiedName)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getProfileURI() { + return profileURI; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setProfileURI(String newProfileURI) { + String oldProfileURI = profileURI; + profileURI = newProfileURI; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__PROFILE_URI, oldProfileURI, profileURI)); + } + + /** + * <!-- 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 UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__NAME: + return getName(); + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__DESCRIPTION: + return getDescription(); + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: + return getStereotypeQualifiedName(); + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__PROFILE_URI: + return getProfileURI(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__NAME: + setName((String)newValue); + return; + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__DESCRIPTION: + setDescription((String)newValue); + return; + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: + setStereotypeQualifiedName((String)newValue); + return; + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__PROFILE_URI: + setProfileURI((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__NAME: + setName(NAME_EDEFAULT); + return; + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__DESCRIPTION: + setDescription(DESCRIPTION_EDEFAULT); + return; + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: + setStereotypeQualifiedName(STEREOTYPE_QUALIFIED_NAME_EDEFAULT); + return; + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__PROFILE_URI: + setProfileURI(PROFILE_URI_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__DESCRIPTION: + return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: + return STEREOTYPE_QUALIFIED_NAME_EDEFAULT == null ? stereotypeQualifiedName != null : !STEREOTYPE_QUALIFIED_NAME_EDEFAULT.equals(stereotypeQualifiedName); + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION__PROFILE_URI: + return PROFILE_URI_EDEFAULT == null ? profileURI != null : !PROFILE_URI_EDEFAULT.equals(profileURI); + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { + switch (operationID) { + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_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(", stereotypeQualifiedName: "); //$NON-NLS-1$ + result.append(stereotypeQualifiedName); + result.append(", profileURI: "); //$NON-NLS-1$ + result.append(profileURI); + result.append(')'); + return result.toString(); + } + +} //AbstractStereotypeExpressionImpl diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/AbstractUMLEClassExpressionImpl.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/AbstractUMLEClassExpressionImpl.java new file mode 100755 index 00000000000..25a6bb8f47a --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/AbstractUMLEClassExpressionImpl.java @@ -0,0 +1,325 @@ +/** + * 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.uml.expressions.umlexpressions.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.uml.expressions.umlexpressions.AbstractUMLEClassExpression; +import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Abstract UMLE Class Expression</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.AbstractUMLEClassExpressionImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.AbstractUMLEClassExpressionImpl#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.AbstractUMLEClassExpressionImpl#getUmlEClass <em>Uml EClass</em>}</li> + * </ul> + * + * @generated + */ +public abstract class AbstractUMLEClassExpressionImpl extends MinimalEObjectImpl.Container implements AbstractUMLEClassExpression { + /** + * 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 #getUmlEClass() <em>Uml EClass</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getUmlEClass() + * @generated + * @ordered + */ + protected EClass umlEClass; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected AbstractUMLEClassExpressionImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return UMLExpressionsPackage.Literals.ABSTRACT_UMLE_CLASS_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, UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_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, UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__DESCRIPTION, oldDescription, description)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EClass getUmlEClass() { + if (umlEClass != null && umlEClass.eIsProxy()) { + InternalEObject oldUmlEClass = (InternalEObject)umlEClass; + umlEClass = (EClass)eResolveProxy(oldUmlEClass); + if (umlEClass != oldUmlEClass) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__UML_ECLASS, oldUmlEClass, umlEClass)); + } + } + return umlEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EClass basicGetUmlEClass() { + return umlEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setUmlEClass(EClass newUmlEClass) { + EClass oldUmlEClass = umlEClass; + umlEClass = newUmlEClass; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__UML_ECLASS, oldUmlEClass, umlEClass)); + } + + /** + * <!-- 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 UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__NAME: + return getName(); + case UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__DESCRIPTION: + return getDescription(); + case UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__UML_ECLASS: + if (resolve) return getUmlEClass(); + return basicGetUmlEClass(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__NAME: + setName((String)newValue); + return; + case UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__DESCRIPTION: + setDescription((String)newValue); + return; + case UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__UML_ECLASS: + setUmlEClass((EClass)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__NAME: + setName(NAME_EDEFAULT); + return; + case UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__DESCRIPTION: + setDescription(DESCRIPTION_EDEFAULT); + return; + case UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__UML_ECLASS: + setUmlEClass((EClass)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__DESCRIPTION: + return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); + case UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION__UML_ECLASS: + return umlEClass != 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 UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_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(); + } + +} //AbstractUMLEClassExpressionImpl diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/HasAppliedStereotypesExpressionImpl.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/HasAppliedStereotypesExpressionImpl.java index 7e839393016..181525ade36 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/HasAppliedStereotypesExpressionImpl.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/HasAppliedStereotypesExpressionImpl.java @@ -1,16 +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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.impl; diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsKindOfExpressionImpl.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsKindOfExpressionImpl.java index 4261027ab57..feabb01ab9c 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsKindOfExpressionImpl.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsKindOfExpressionImpl.java @@ -1,31 +1,19 @@ /** * 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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.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.uml.expressions.umlexpressions.IsKindOfExpression; import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; @@ -34,68 +22,10 @@ import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Is Kind Of Expression</b></em>'. * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * </p> - * <ul> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfExpressionImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfExpressionImpl#getDescription <em>Description</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfExpressionImpl#getUmlEClass <em>Uml EClass</em>}</li> - * </ul> * * @generated */ -public class IsKindOfExpressionImpl extends MinimalEObjectImpl.Container implements IsKindOfExpression { - /** - * 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 #getUmlEClass() <em>Uml EClass</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getUmlEClass() - * @generated - * @ordered - */ - protected EClass umlEClass; - +public class IsKindOfExpressionImpl extends AbstractUMLEClassExpressionImpl implements IsKindOfExpression { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -115,212 +45,4 @@ public class IsKindOfExpressionImpl extends MinimalEObjectImpl.Container impleme return UMLExpressionsPackage.Literals.IS_KIND_OF_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, UMLExpressionsPackage.IS_KIND_OF_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, UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__DESCRIPTION, oldDescription, description)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public EClass getUmlEClass() { - if (umlEClass != null && umlEClass.eIsProxy()) { - InternalEObject oldUmlEClass = (InternalEObject)umlEClass; - umlEClass = (EClass)eResolveProxy(oldUmlEClass); - if (umlEClass != oldUmlEClass) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__UML_ECLASS, oldUmlEClass, umlEClass)); - } - } - return umlEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass basicGetUmlEClass() { - return umlEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setUmlEClass(EClass newUmlEClass) { - EClass oldUmlEClass = umlEClass; - umlEClass = newUmlEClass; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__UML_ECLASS, oldUmlEClass, umlEClass)); - } - - /** - * <!-- 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 UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__NAME: - return getName(); - case UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__DESCRIPTION: - return getDescription(); - case UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__UML_ECLASS: - if (resolve) return getUmlEClass(); - return basicGetUmlEClass(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__NAME: - setName((String)newValue); - return; - case UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__DESCRIPTION: - setDescription((String)newValue); - return; - case UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__UML_ECLASS: - setUmlEClass((EClass)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__NAME: - setName(NAME_EDEFAULT); - return; - case UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__DESCRIPTION: - setDescription(DESCRIPTION_EDEFAULT); - return; - case UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__UML_ECLASS: - setUmlEClass((EClass)null); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__DESCRIPTION: - return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); - case UMLExpressionsPackage.IS_KIND_OF_EXPRESSION__UML_ECLASS: - return umlEClass != 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 UMLExpressionsPackage.IS_KIND_OF_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(); - } - } //IsKindOfExpressionImpl diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsKindOfStereotypeExpressionImpl.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsKindOfStereotypeExpressionImpl.java index a1a6fdfbd9f..c04676bc6fb 100644..100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsKindOfStereotypeExpressionImpl.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsKindOfStereotypeExpressionImpl.java @@ -1,26 +1,19 @@ /** * 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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.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.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression; import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; @@ -29,99 +22,10 @@ import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Is Kind Of Stereotype Expression</b></em>'. * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * </p> - * <ul> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfStereotypeExpressionImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfStereotypeExpressionImpl#getDescription <em>Description</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfStereotypeExpressionImpl#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfStereotypeExpressionImpl#getProfileURI <em>Profile URI</em>}</li> - * </ul> * * @generated */ -public class IsKindOfStereotypeExpressionImpl extends MinimalEObjectImpl.Container implements IsKindOfStereotypeExpression { - /** - * 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 default value of the '{@link #getStereotypeQualifiedName() <em>Stereotype Qualified Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getStereotypeQualifiedName() - * @generated - * @ordered - */ - protected static final String STEREOTYPE_QUALIFIED_NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getStereotypeQualifiedName() <em>Stereotype Qualified Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getStereotypeQualifiedName() - * @generated - * @ordered - */ - protected String stereotypeQualifiedName = STEREOTYPE_QUALIFIED_NAME_EDEFAULT; - - /** - * The default value of the '{@link #getProfileURI() <em>Profile URI</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getProfileURI() - * @generated - * @ordered - */ - protected static final String PROFILE_URI_EDEFAULT = null; - - /** - * The cached value of the '{@link #getProfileURI() <em>Profile URI</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getProfileURI() - * @generated - * @ordered - */ - protected String profileURI = PROFILE_URI_EDEFAULT; - +public class IsKindOfStereotypeExpressionImpl extends AbstractStereotypeExpressionImpl implements IsKindOfStereotypeExpression { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -141,231 +45,4 @@ public class IsKindOfStereotypeExpressionImpl extends MinimalEObjectImpl.Contain return UMLExpressionsPackage.Literals.IS_KIND_OF_STEREOTYPE_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, UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_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, UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__DESCRIPTION, oldDescription, description)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getStereotypeQualifiedName() { - return stereotypeQualifiedName; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setStereotypeQualifiedName(String newStereotypeQualifiedName) { - String oldStereotypeQualifiedName = stereotypeQualifiedName; - stereotypeQualifiedName = newStereotypeQualifiedName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME, oldStereotypeQualifiedName, stereotypeQualifiedName)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getProfileURI() { - return profileURI; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setProfileURI(String newProfileURI) { - String oldProfileURI = profileURI; - profileURI = newProfileURI; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__PROFILE_URI, oldProfileURI, profileURI)); - } - - /** - * <!-- 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 UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__NAME: - return getName(); - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__DESCRIPTION: - return getDescription(); - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: - return getStereotypeQualifiedName(); - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__PROFILE_URI: - return getProfileURI(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__NAME: - setName((String)newValue); - return; - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__DESCRIPTION: - setDescription((String)newValue); - return; - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: - setStereotypeQualifiedName((String)newValue); - return; - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__PROFILE_URI: - setProfileURI((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__NAME: - setName(NAME_EDEFAULT); - return; - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__DESCRIPTION: - setDescription(DESCRIPTION_EDEFAULT); - return; - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: - setStereotypeQualifiedName(STEREOTYPE_QUALIFIED_NAME_EDEFAULT); - return; - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__PROFILE_URI: - setProfileURI(PROFILE_URI_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__DESCRIPTION: - return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: - return STEREOTYPE_QUALIFIED_NAME_EDEFAULT == null ? stereotypeQualifiedName != null : !STEREOTYPE_QUALIFIED_NAME_EDEFAULT.equals(stereotypeQualifiedName); - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION__PROFILE_URI: - return PROFILE_URI_EDEFAULT == null ? profileURI != null : !PROFILE_URI_EDEFAULT.equals(profileURI); - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { - switch (operationID) { - case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_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(", stereotypeQualifiedName: "); //$NON-NLS-1$ - result.append(stereotypeQualifiedName); - result.append(", profileURI: "); //$NON-NLS-1$ - result.append(profileURI); - result.append(')'); - return result.toString(); - } - } //IsKindOfStereotypeExpressionImpl diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsStereotypedWithExpressionImpl.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsStereotypedWithExpressionImpl.java index dd4075e28e7..015dcef55f8 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsStereotypedWithExpressionImpl.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsStereotypedWithExpressionImpl.java @@ -1,26 +1,19 @@ /** * 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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.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.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.uml.expressions.umlexpressions.IsStereotypedWithExpression; import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; @@ -29,99 +22,10 @@ import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Is Stereotyped With Expression</b></em>'. * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * </p> - * <ul> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsStereotypedWithExpressionImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsStereotypedWithExpressionImpl#getDescription <em>Description</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsStereotypedWithExpressionImpl#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsStereotypedWithExpressionImpl#getProfileURI <em>Profile URI</em>}</li> - * </ul> * * @generated */ -public class IsStereotypedWithExpressionImpl extends MinimalEObjectImpl.Container implements IsStereotypedWithExpression { - /** - * 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 default value of the '{@link #getStereotypeQualifiedName() <em>Stereotype Qualified Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getStereotypeQualifiedName() - * @generated - * @ordered - */ - protected static final String STEREOTYPE_QUALIFIED_NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getStereotypeQualifiedName() <em>Stereotype Qualified Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getStereotypeQualifiedName() - * @generated - * @ordered - */ - protected String stereotypeQualifiedName = STEREOTYPE_QUALIFIED_NAME_EDEFAULT; - - /** - * The default value of the '{@link #getProfileURI() <em>Profile URI</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getProfileURI() - * @generated - * @ordered - */ - protected static final String PROFILE_URI_EDEFAULT = null; - - /** - * The cached value of the '{@link #getProfileURI() <em>Profile URI</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getProfileURI() - * @generated - * @ordered - */ - protected String profileURI = PROFILE_URI_EDEFAULT; - +public class IsStereotypedWithExpressionImpl extends AbstractStereotypeExpressionImpl implements IsStereotypedWithExpression { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -141,231 +45,4 @@ public class IsStereotypedWithExpressionImpl extends MinimalEObjectImpl.Containe return UMLExpressionsPackage.Literals.IS_STEREOTYPED_WITH_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, UMLExpressionsPackage.IS_STEREOTYPED_WITH_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, UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__DESCRIPTION, oldDescription, description)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getStereotypeQualifiedName() { - return stereotypeQualifiedName; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setStereotypeQualifiedName(String newStereotypeQualifiedName) { - String oldStereotypeQualifiedName = stereotypeQualifiedName; - stereotypeQualifiedName = newStereotypeQualifiedName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__STEREOTYPE_QUALIFIED_NAME, oldStereotypeQualifiedName, stereotypeQualifiedName)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getProfileURI() { - return profileURI; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setProfileURI(String newProfileURI) { - String oldProfileURI = profileURI; - profileURI = newProfileURI; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__PROFILE_URI, oldProfileURI, profileURI)); - } - - /** - * <!-- 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 UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__NAME: - return getName(); - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__DESCRIPTION: - return getDescription(); - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: - return getStereotypeQualifiedName(); - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__PROFILE_URI: - return getProfileURI(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__NAME: - setName((String)newValue); - return; - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__DESCRIPTION: - setDescription((String)newValue); - return; - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: - setStereotypeQualifiedName((String)newValue); - return; - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__PROFILE_URI: - setProfileURI((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__NAME: - setName(NAME_EDEFAULT); - return; - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__DESCRIPTION: - setDescription(DESCRIPTION_EDEFAULT); - return; - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: - setStereotypeQualifiedName(STEREOTYPE_QUALIFIED_NAME_EDEFAULT); - return; - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__PROFILE_URI: - setProfileURI(PROFILE_URI_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__DESCRIPTION: - return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: - return STEREOTYPE_QUALIFIED_NAME_EDEFAULT == null ? stereotypeQualifiedName != null : !STEREOTYPE_QUALIFIED_NAME_EDEFAULT.equals(stereotypeQualifiedName); - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION__PROFILE_URI: - return PROFILE_URI_EDEFAULT == null ? profileURI != null : !PROFILE_URI_EDEFAULT.equals(profileURI); - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { - switch (operationID) { - case UMLExpressionsPackage.IS_STEREOTYPED_WITH_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(", stereotypeQualifiedName: "); //$NON-NLS-1$ - result.append(stereotypeQualifiedName); - result.append(", profileURI: "); //$NON-NLS-1$ - result.append(profileURI); - result.append(')'); - return result.toString(); - } - } //IsStereotypedWithExpressionImpl diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsTypeOfExpressionImpl.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsTypeOfExpressionImpl.java index 485554df247..cfb5feb9a36 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsTypeOfExpressionImpl.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsTypeOfExpressionImpl.java @@ -1,31 +1,19 @@ /** * 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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.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.uml.expressions.umlexpressions.IsTypeOfExpression; import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; @@ -34,68 +22,10 @@ import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Is Type Of Expression</b></em>'. * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * </p> - * <ul> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsTypeOfExpressionImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsTypeOfExpressionImpl#getDescription <em>Description</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsTypeOfExpressionImpl#getUmlEClass <em>Uml EClass</em>}</li> - * </ul> * * @generated */ -public class IsTypeOfExpressionImpl extends MinimalEObjectImpl.Container implements IsTypeOfExpression { - /** - * 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 #getUmlEClass() <em>Uml EClass</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getUmlEClass() - * @generated - * @ordered - */ - protected EClass umlEClass; - +public class IsTypeOfExpressionImpl extends AbstractUMLEClassExpressionImpl implements IsTypeOfExpression { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -115,212 +45,4 @@ public class IsTypeOfExpressionImpl extends MinimalEObjectImpl.Container impleme return UMLExpressionsPackage.Literals.IS_TYPE_OF_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, UMLExpressionsPackage.IS_TYPE_OF_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, UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__DESCRIPTION, oldDescription, description)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public EClass getUmlEClass() { - if (umlEClass != null && umlEClass.eIsProxy()) { - InternalEObject oldUmlEClass = (InternalEObject)umlEClass; - umlEClass = (EClass)eResolveProxy(oldUmlEClass); - if (umlEClass != oldUmlEClass) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__UML_ECLASS, oldUmlEClass, umlEClass)); - } - } - return umlEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass basicGetUmlEClass() { - return umlEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setUmlEClass(EClass newUmlEClass) { - EClass oldUmlEClass = umlEClass; - umlEClass = newUmlEClass; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__UML_ECLASS, oldUmlEClass, umlEClass)); - } - - /** - * <!-- 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 UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__NAME: - return getName(); - case UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__DESCRIPTION: - return getDescription(); - case UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__UML_ECLASS: - if (resolve) return getUmlEClass(); - return basicGetUmlEClass(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__NAME: - setName((String)newValue); - return; - case UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__DESCRIPTION: - setDescription((String)newValue); - return; - case UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__UML_ECLASS: - setUmlEClass((EClass)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__NAME: - setName(NAME_EDEFAULT); - return; - case UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__DESCRIPTION: - setDescription(DESCRIPTION_EDEFAULT); - return; - case UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__UML_ECLASS: - setUmlEClass((EClass)null); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__DESCRIPTION: - return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); - case UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION__UML_ECLASS: - return umlEClass != 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 UMLExpressionsPackage.IS_TYPE_OF_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(); - } - } //IsTypeOfExpressionImpl diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsTypeOfStereotypeExpressionImpl.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsTypeOfStereotypeExpressionImpl.java index 16295736525..3c14cfaa4ac 100644..100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsTypeOfStereotypeExpressionImpl.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsTypeOfStereotypeExpressionImpl.java @@ -1,26 +1,19 @@ /** * 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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.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.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression; import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; @@ -29,99 +22,10 @@ import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Is Type Of Stereotype Expression</b></em>'. * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * </p> - * <ul> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsTypeOfStereotypeExpressionImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsTypeOfStereotypeExpressionImpl#getDescription <em>Description</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsTypeOfStereotypeExpressionImpl#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsTypeOfStereotypeExpressionImpl#getProfileURI <em>Profile URI</em>}</li> - * </ul> * * @generated */ -public class IsTypeOfStereotypeExpressionImpl extends MinimalEObjectImpl.Container implements IsTypeOfStereotypeExpression { - /** - * 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 default value of the '{@link #getStereotypeQualifiedName() <em>Stereotype Qualified Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getStereotypeQualifiedName() - * @generated - * @ordered - */ - protected static final String STEREOTYPE_QUALIFIED_NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getStereotypeQualifiedName() <em>Stereotype Qualified Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getStereotypeQualifiedName() - * @generated - * @ordered - */ - protected String stereotypeQualifiedName = STEREOTYPE_QUALIFIED_NAME_EDEFAULT; - - /** - * The default value of the '{@link #getProfileURI() <em>Profile URI</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getProfileURI() - * @generated - * @ordered - */ - protected static final String PROFILE_URI_EDEFAULT = null; - - /** - * The cached value of the '{@link #getProfileURI() <em>Profile URI</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getProfileURI() - * @generated - * @ordered - */ - protected String profileURI = PROFILE_URI_EDEFAULT; - +public class IsTypeOfStereotypeExpressionImpl extends AbstractStereotypeExpressionImpl implements IsTypeOfStereotypeExpression { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -141,231 +45,4 @@ public class IsTypeOfStereotypeExpressionImpl extends MinimalEObjectImpl.Contain return UMLExpressionsPackage.Literals.IS_TYPE_OF_STEREOTYPE_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, UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_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, UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__DESCRIPTION, oldDescription, description)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getStereotypeQualifiedName() { - return stereotypeQualifiedName; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setStereotypeQualifiedName(String newStereotypeQualifiedName) { - String oldStereotypeQualifiedName = stereotypeQualifiedName; - stereotypeQualifiedName = newStereotypeQualifiedName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME, oldStereotypeQualifiedName, stereotypeQualifiedName)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getProfileURI() { - return profileURI; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setProfileURI(String newProfileURI) { - String oldProfileURI = profileURI; - profileURI = newProfileURI; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__PROFILE_URI, oldProfileURI, profileURI)); - } - - /** - * <!-- 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 UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__NAME: - return getName(); - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__DESCRIPTION: - return getDescription(); - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: - return getStereotypeQualifiedName(); - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__PROFILE_URI: - return getProfileURI(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__NAME: - setName((String)newValue); - return; - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__DESCRIPTION: - setDescription((String)newValue); - return; - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: - setStereotypeQualifiedName((String)newValue); - return; - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__PROFILE_URI: - setProfileURI((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__NAME: - setName(NAME_EDEFAULT); - return; - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__DESCRIPTION: - setDescription(DESCRIPTION_EDEFAULT); - return; - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: - setStereotypeQualifiedName(STEREOTYPE_QUALIFIED_NAME_EDEFAULT); - return; - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__PROFILE_URI: - setProfileURI(PROFILE_URI_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__DESCRIPTION: - return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME: - return STEREOTYPE_QUALIFIED_NAME_EDEFAULT == null ? stereotypeQualifiedName != null : !STEREOTYPE_QUALIFIED_NAME_EDEFAULT.equals(stereotypeQualifiedName); - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION__PROFILE_URI: - return PROFILE_URI_EDEFAULT == null ? profileURI != null : !PROFILE_URI_EDEFAULT.equals(profileURI); - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { - switch (operationID) { - case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_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(", stereotypeQualifiedName: "); //$NON-NLS-1$ - result.append(stereotypeQualifiedName); - result.append(", profileURI: "); //$NON-NLS-1$ - result.append(profileURI); - result.append(')'); - return result.toString(); - } - } //IsTypeOfStereotypeExpressionImpl diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/SingleStereotypeAttributeEqualityExpressionImpl.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/SingleStereotypeAttributeEqualityExpressionImpl.java new file mode 100755 index 00000000000..25983674df5 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/SingleStereotypeAttributeEqualityExpressionImpl.java @@ -0,0 +1,231 @@ +/** + * 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.uml.expressions.umlexpressions.impl; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +import org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression; +import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Single Stereotype Attribute Equality Expression</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.SingleStereotypeAttributeEqualityExpressionImpl#getExpectedValue <em>Expected Value</em>}</li> + * <li>{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.SingleStereotypeAttributeEqualityExpressionImpl#getPropertyName <em>Property Name</em>}</li> + * </ul> + * + * @generated + */ +public class SingleStereotypeAttributeEqualityExpressionImpl extends AbstractStereotypeExpressionImpl implements SingleStereotypeAttributeEqualityExpression { + /** + * The default value of the '{@link #getExpectedValue() <em>Expected Value</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getExpectedValue() + * @generated + * @ordered + */ + protected static final String EXPECTED_VALUE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getExpectedValue() <em>Expected Value</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getExpectedValue() + * @generated + * @ordered + */ + protected String expectedValue = EXPECTED_VALUE_EDEFAULT; + + /** + * The default value of the '{@link #getPropertyName() <em>Property Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getPropertyName() + * @generated + * @ordered + */ + protected static final String PROPERTY_NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getPropertyName() <em>Property Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getPropertyName() + * @generated + * @ordered + */ + protected String propertyName = PROPERTY_NAME_EDEFAULT; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected SingleStereotypeAttributeEqualityExpressionImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return UMLExpressionsPackage.Literals.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getExpectedValue() { + return expectedValue; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setExpectedValue(String newExpectedValue) { + String oldExpectedValue = expectedValue; + expectedValue = newExpectedValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, UMLExpressionsPackage.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__EXPECTED_VALUE, oldExpectedValue, expectedValue)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getPropertyName() { + return propertyName; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setPropertyName(String newPropertyName) { + String oldPropertyName = propertyName; + propertyName = newPropertyName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, UMLExpressionsPackage.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__PROPERTY_NAME, oldPropertyName, propertyName)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case UMLExpressionsPackage.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__EXPECTED_VALUE: + return getExpectedValue(); + case UMLExpressionsPackage.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__PROPERTY_NAME: + return getPropertyName(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case UMLExpressionsPackage.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__EXPECTED_VALUE: + setExpectedValue((String)newValue); + return; + case UMLExpressionsPackage.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__PROPERTY_NAME: + setPropertyName((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case UMLExpressionsPackage.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__EXPECTED_VALUE: + setExpectedValue(EXPECTED_VALUE_EDEFAULT); + return; + case UMLExpressionsPackage.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__PROPERTY_NAME: + setPropertyName(PROPERTY_NAME_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case UMLExpressionsPackage.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__EXPECTED_VALUE: + return EXPECTED_VALUE_EDEFAULT == null ? expectedValue != null : !EXPECTED_VALUE_EDEFAULT.equals(expectedValue); + case UMLExpressionsPackage.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__PROPERTY_NAME: + return PROPERTY_NAME_EDEFAULT == null ? propertyName != null : !PROPERTY_NAME_EDEFAULT.equals(propertyName); + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (expectedValue: "); //$NON-NLS-1$ + result.append(expectedValue); + result.append(", propertyName: "); //$NON-NLS-1$ + result.append(propertyName); + result.append(')'); + return result.toString(); + } + +} //SingleStereotypeAttributeEqualityExpressionImpl diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/UMLExpressionsFactoryImpl.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/UMLExpressionsFactoryImpl.java index 6270b8ac7a9..746aed646f5 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/UMLExpressionsFactoryImpl.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/UMLExpressionsFactoryImpl.java @@ -1,16 +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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.impl; @@ -74,6 +73,7 @@ public class UMLExpressionsFactoryImpl extends EFactoryImpl implements UMLExpres case UMLExpressionsPackage.IS_KIND_OF_EXPRESSION: return createIsKindOfExpression(); case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION: return createIsKindOfStereotypeExpression(); case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION: return createIsTypeOfStereotypeExpression(); + case UMLExpressionsPackage.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION: return createSingleStereotypeAttributeEqualityExpression(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -151,6 +151,17 @@ public class UMLExpressionsFactoryImpl extends EFactoryImpl implements UMLExpres * @generated */ @Override + public SingleStereotypeAttributeEqualityExpression createSingleStereotypeAttributeEqualityExpression() { + SingleStereotypeAttributeEqualityExpressionImpl singleStereotypeAttributeEqualityExpression = new SingleStereotypeAttributeEqualityExpressionImpl(); + return singleStereotypeAttributeEqualityExpression; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override public UMLExpressionsPackage getUMLExpressionsPackage() { return (UMLExpressionsPackage)getEPackage(); } diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/UMLExpressionsPackageImpl.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/UMLExpressionsPackageImpl.java index 98402e2c87e..053b3c2fbec 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/UMLExpressionsPackageImpl.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/UMLExpressionsPackageImpl.java @@ -1,16 +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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.impl; @@ -19,15 +18,22 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EcorePackage; + import org.eclipse.emf.ecore.impl.EPackageImpl; + import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage; + import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage; + +import org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractStereotypeExpression; +import org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractUMLEClassExpression; import org.eclipse.papyrus.uml.expressions.umlexpressions.HasAppliedStereotypesExpression; import org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfExpression; import org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression; import org.eclipse.papyrus.uml.expressions.umlexpressions.IsStereotypedWithExpression; import org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfExpression; import org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression; +import org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression; import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsFactory; import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage; @@ -50,6 +56,13 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres * <!-- end-user-doc --> * @generated */ + private EClass abstractStereotypeExpressionEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EClass hasAppliedStereotypesExpressionEClass = null; /** @@ -64,6 +77,13 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres * <!-- end-user-doc --> * @generated */ + private EClass abstractUMLEClassExpressionEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EClass isKindOfExpressionEClass = null; /** @@ -81,6 +101,13 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres private EClass isTypeOfStereotypeExpressionEClass = null; /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass singleStereotypeAttributeEqualityExpressionEClass = null; + + /** * Creates an instance of the model <b>Package</b>, registered with * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package * package URI value. @@ -161,8 +188,8 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres * @generated */ @Override - public EAttribute getIsStereotypedWithExpression_StereotypeQualifiedName() { - return (EAttribute)isStereotypedWithExpressionEClass.getEStructuralFeatures().get(0); + public EClass getAbstractStereotypeExpression() { + return abstractStereotypeExpressionEClass; } /** @@ -171,8 +198,8 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres * @generated */ @Override - public EAttribute getIsStereotypedWithExpression_ProfileURI() { - return (EAttribute)isStereotypedWithExpressionEClass.getEStructuralFeatures().get(1); + public EAttribute getAbstractStereotypeExpression_StereotypeQualifiedName() { + return (EAttribute)abstractStereotypeExpressionEClass.getEStructuralFeatures().get(0); } /** @@ -181,8 +208,8 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres * @generated */ @Override - public EClass getHasAppliedStereotypesExpression() { - return hasAppliedStereotypesExpressionEClass; + public EAttribute getAbstractStereotypeExpression_ProfileURI() { + return (EAttribute)abstractStereotypeExpressionEClass.getEStructuralFeatures().get(1); } /** @@ -191,8 +218,8 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres * @generated */ @Override - public EClass getIsTypeOfExpression() { - return isTypeOfExpressionEClass; + public EClass getHasAppliedStereotypesExpression() { + return hasAppliedStereotypesExpressionEClass; } /** @@ -201,8 +228,8 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres * @generated */ @Override - public EReference getIsTypeOfExpression_UmlEClass() { - return (EReference)isTypeOfExpressionEClass.getEStructuralFeatures().get(0); + public EClass getIsTypeOfExpression() { + return isTypeOfExpressionEClass; } /** @@ -211,8 +238,8 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres * @generated */ @Override - public EClass getIsKindOfExpression() { - return isKindOfExpressionEClass; + public EClass getAbstractUMLEClassExpression() { + return abstractUMLEClassExpressionEClass; } /** @@ -221,8 +248,8 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres * @generated */ @Override - public EReference getIsKindOfExpression_UmlEClass() { - return (EReference)isKindOfExpressionEClass.getEStructuralFeatures().get(0); + public EReference getAbstractUMLEClassExpression_UmlEClass() { + return (EReference)abstractUMLEClassExpressionEClass.getEStructuralFeatures().get(0); } /** @@ -231,8 +258,8 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres * @generated */ @Override - public EClass getIsKindOfStereotypeExpression() { - return isKindOfStereotypeExpressionEClass; + public EClass getIsKindOfExpression() { + return isKindOfExpressionEClass; } /** @@ -241,8 +268,8 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres * @generated */ @Override - public EAttribute getIsKindOfStereotypeExpression_StereotypeQualifiedName() { - return (EAttribute)isKindOfStereotypeExpressionEClass.getEStructuralFeatures().get(0); + public EClass getIsKindOfStereotypeExpression() { + return isKindOfStereotypeExpressionEClass; } /** @@ -251,8 +278,8 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres * @generated */ @Override - public EAttribute getIsKindOfStereotypeExpression_ProfileURI() { - return (EAttribute)isKindOfStereotypeExpressionEClass.getEStructuralFeatures().get(1); + public EClass getIsTypeOfStereotypeExpression() { + return isTypeOfStereotypeExpressionEClass; } /** @@ -261,8 +288,8 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres * @generated */ @Override - public EClass getIsTypeOfStereotypeExpression() { - return isTypeOfStereotypeExpressionEClass; + public EClass getSingleStereotypeAttributeEqualityExpression() { + return singleStereotypeAttributeEqualityExpressionEClass; } /** @@ -271,8 +298,8 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres * @generated */ @Override - public EAttribute getIsTypeOfStereotypeExpression_StereotypeQualifiedName() { - return (EAttribute)isTypeOfStereotypeExpressionEClass.getEStructuralFeatures().get(0); + public EAttribute getSingleStereotypeAttributeEqualityExpression_ExpectedValue() { + return (EAttribute)singleStereotypeAttributeEqualityExpressionEClass.getEStructuralFeatures().get(0); } /** @@ -281,8 +308,8 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres * @generated */ @Override - public EAttribute getIsTypeOfStereotypeExpression_ProfileURI() { - return (EAttribute)isTypeOfStereotypeExpressionEClass.getEStructuralFeatures().get(1); + public EAttribute getSingleStereotypeAttributeEqualityExpression_PropertyName() { + return (EAttribute)singleStereotypeAttributeEqualityExpressionEClass.getEStructuralFeatures().get(1); } /** @@ -315,24 +342,27 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres // Create classes and their features isStereotypedWithExpressionEClass = createEClass(IS_STEREOTYPED_WITH_EXPRESSION); - createEAttribute(isStereotypedWithExpressionEClass, IS_STEREOTYPED_WITH_EXPRESSION__STEREOTYPE_QUALIFIED_NAME); - createEAttribute(isStereotypedWithExpressionEClass, IS_STEREOTYPED_WITH_EXPRESSION__PROFILE_URI); + + abstractStereotypeExpressionEClass = createEClass(ABSTRACT_STEREOTYPE_EXPRESSION); + createEAttribute(abstractStereotypeExpressionEClass, ABSTRACT_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME); + createEAttribute(abstractStereotypeExpressionEClass, ABSTRACT_STEREOTYPE_EXPRESSION__PROFILE_URI); hasAppliedStereotypesExpressionEClass = createEClass(HAS_APPLIED_STEREOTYPES_EXPRESSION); isTypeOfExpressionEClass = createEClass(IS_TYPE_OF_EXPRESSION); - createEReference(isTypeOfExpressionEClass, IS_TYPE_OF_EXPRESSION__UML_ECLASS); + + abstractUMLEClassExpressionEClass = createEClass(ABSTRACT_UMLE_CLASS_EXPRESSION); + createEReference(abstractUMLEClassExpressionEClass, ABSTRACT_UMLE_CLASS_EXPRESSION__UML_ECLASS); isKindOfExpressionEClass = createEClass(IS_KIND_OF_EXPRESSION); - createEReference(isKindOfExpressionEClass, IS_KIND_OF_EXPRESSION__UML_ECLASS); isKindOfStereotypeExpressionEClass = createEClass(IS_KIND_OF_STEREOTYPE_EXPRESSION); - createEAttribute(isKindOfStereotypeExpressionEClass, IS_KIND_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME); - createEAttribute(isKindOfStereotypeExpressionEClass, IS_KIND_OF_STEREOTYPE_EXPRESSION__PROFILE_URI); isTypeOfStereotypeExpressionEClass = createEClass(IS_TYPE_OF_STEREOTYPE_EXPRESSION); - createEAttribute(isTypeOfStereotypeExpressionEClass, IS_TYPE_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME); - createEAttribute(isTypeOfStereotypeExpressionEClass, IS_TYPE_OF_STEREOTYPE_EXPRESSION__PROFILE_URI); + + singleStereotypeAttributeEqualityExpressionEClass = createEClass(SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION); + createEAttribute(singleStereotypeAttributeEqualityExpressionEClass, SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__EXPECTED_VALUE); + createEAttribute(singleStereotypeAttributeEqualityExpressionEClass, SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION__PROPERTY_NAME); } /** @@ -367,33 +397,39 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres // Set bounds for type parameters // Add supertypes to classes - isStereotypedWithExpressionEClass.getESuperTypes().add(theBooleanExpressionsPackage.getIBooleanEObjectExpression()); + isStereotypedWithExpressionEClass.getESuperTypes().add(this.getAbstractStereotypeExpression()); + abstractStereotypeExpressionEClass.getESuperTypes().add(theBooleanExpressionsPackage.getIBooleanEObjectExpression()); hasAppliedStereotypesExpressionEClass.getESuperTypes().add(theBooleanExpressionsPackage.getIBooleanEObjectExpression()); - isTypeOfExpressionEClass.getESuperTypes().add(theBooleanExpressionsPackage.getIBooleanEObjectExpression()); - isKindOfExpressionEClass.getESuperTypes().add(theBooleanExpressionsPackage.getIBooleanEObjectExpression()); - isKindOfStereotypeExpressionEClass.getESuperTypes().add(theBooleanExpressionsPackage.getIBooleanEObjectExpression()); - isTypeOfStereotypeExpressionEClass.getESuperTypes().add(theBooleanExpressionsPackage.getIBooleanEObjectExpression()); + isTypeOfExpressionEClass.getESuperTypes().add(this.getAbstractUMLEClassExpression()); + abstractUMLEClassExpressionEClass.getESuperTypes().add(theBooleanExpressionsPackage.getIBooleanEObjectExpression()); + isKindOfExpressionEClass.getESuperTypes().add(this.getAbstractUMLEClassExpression()); + isKindOfStereotypeExpressionEClass.getESuperTypes().add(this.getAbstractStereotypeExpression()); + isTypeOfStereotypeExpressionEClass.getESuperTypes().add(this.getAbstractStereotypeExpression()); + singleStereotypeAttributeEqualityExpressionEClass.getESuperTypes().add(this.getAbstractStereotypeExpression()); // Initialize classes, features, and operations; add parameters initEClass(isStereotypedWithExpressionEClass, IsStereotypedWithExpression.class, "IsStereotypedWithExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getIsStereotypedWithExpression_StereotypeQualifiedName(), ecorePackage.getEString(), "stereotypeQualifiedName", null, 0, 1, IsStereotypedWithExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getIsStereotypedWithExpression_ProfileURI(), ecorePackage.getEString(), "profileURI", null, 0, 1, IsStereotypedWithExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + + initEClass(abstractStereotypeExpressionEClass, AbstractStereotypeExpression.class, "AbstractStereotypeExpression", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEAttribute(getAbstractStereotypeExpression_StereotypeQualifiedName(), ecorePackage.getEString(), "stereotypeQualifiedName", null, 0, 1, AbstractStereotypeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getAbstractStereotypeExpression_ProfileURI(), ecorePackage.getEString(), "profileURI", null, 0, 1, AbstractStereotypeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ initEClass(hasAppliedStereotypesExpressionEClass, HasAppliedStereotypesExpression.class, "HasAppliedStereotypesExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEClass(isTypeOfExpressionEClass, IsTypeOfExpression.class, "IsTypeOfExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getIsTypeOfExpression_UmlEClass(), theEcorePackage.getEClass(), null, "umlEClass", null, 0, 1, IsTypeOfExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + + initEClass(abstractUMLEClassExpressionEClass, AbstractUMLEClassExpression.class, "AbstractUMLEClassExpression", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getAbstractUMLEClassExpression_UmlEClass(), theEcorePackage.getEClass(), null, "umlEClass", null, 0, 1, AbstractUMLEClassExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ initEClass(isKindOfExpressionEClass, IsKindOfExpression.class, "IsKindOfExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getIsKindOfExpression_UmlEClass(), theEcorePackage.getEClass(), null, "umlEClass", null, 0, 1, IsKindOfExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ initEClass(isKindOfStereotypeExpressionEClass, IsKindOfStereotypeExpression.class, "IsKindOfStereotypeExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getIsKindOfStereotypeExpression_StereotypeQualifiedName(), ecorePackage.getEString(), "stereotypeQualifiedName", null, 0, 1, IsKindOfStereotypeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getIsKindOfStereotypeExpression_ProfileURI(), ecorePackage.getEString(), "profileURI", null, 0, 1, IsKindOfStereotypeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ initEClass(isTypeOfStereotypeExpressionEClass, IsTypeOfStereotypeExpression.class, "IsTypeOfStereotypeExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getIsTypeOfStereotypeExpression_StereotypeQualifiedName(), ecorePackage.getEString(), "stereotypeQualifiedName", null, 0, 1, IsTypeOfStereotypeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getIsTypeOfStereotypeExpression_ProfileURI(), ecorePackage.getEString(), "profileURI", null, 0, 1, IsTypeOfStereotypeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + + initEClass(singleStereotypeAttributeEqualityExpressionEClass, SingleStereotypeAttributeEqualityExpression.class, "SingleStereotypeAttributeEqualityExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEAttribute(getSingleStereotypeAttributeEqualityExpression_ExpectedValue(), ecorePackage.getEString(), "expectedValue", null, 0, 1, SingleStereotypeAttributeEqualityExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getSingleStereotypeAttributeEqualityExpression_PropertyName(), ecorePackage.getEString(), "propertyName", null, 0, 1, SingleStereotypeAttributeEqualityExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ // Create resource createResource(eNS_URI); diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/util/UMLExpressionsAdapterFactory.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/util/UMLExpressionsAdapterFactory.java index 457c184dbe6..f65d63cd5b7 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/util/UMLExpressionsAdapterFactory.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/util/UMLExpressionsAdapterFactory.java @@ -1,16 +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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.util; @@ -20,10 +19,13 @@ import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject; + import org.eclipse.papyrus.infra.emf.expressions.IBasicExpressionElement; import org.eclipse.papyrus.infra.emf.expressions.IExpression; + import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanExpression; + import org.eclipse.papyrus.uml.expressions.umlexpressions.*; /** @@ -87,6 +89,10 @@ public class UMLExpressionsAdapterFactory extends AdapterFactoryImpl { return createIsStereotypedWithExpressionAdapter(); } @Override + public Adapter caseAbstractStereotypeExpression(AbstractStereotypeExpression object) { + return createAbstractStereotypeExpressionAdapter(); + } + @Override public Adapter caseHasAppliedStereotypesExpression(HasAppliedStereotypesExpression object) { return createHasAppliedStereotypesExpressionAdapter(); } @@ -95,6 +101,10 @@ public class UMLExpressionsAdapterFactory extends AdapterFactoryImpl { return createIsTypeOfExpressionAdapter(); } @Override + public Adapter caseAbstractUMLEClassExpression(AbstractUMLEClassExpression object) { + return createAbstractUMLEClassExpressionAdapter(); + } + @Override public Adapter caseIsKindOfExpression(IsKindOfExpression object) { return createIsKindOfExpressionAdapter(); } @@ -107,6 +117,10 @@ public class UMLExpressionsAdapterFactory extends AdapterFactoryImpl { return createIsTypeOfStereotypeExpressionAdapter(); } @Override + public Adapter caseSingleStereotypeAttributeEqualityExpression(SingleStereotypeAttributeEqualityExpression object) { + return createSingleStereotypeAttributeEqualityExpressionAdapter(); + } + @Override public Adapter caseIBasicExpressionElement(IBasicExpressionElement object) { return createIBasicExpressionElementAdapter(); } @@ -157,6 +171,20 @@ public class UMLExpressionsAdapterFactory extends AdapterFactoryImpl { } /** + * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractStereotypeExpression <em>Abstract Stereotype 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.uml.expressions.umlexpressions.AbstractStereotypeExpression + * @generated + */ + public Adapter createAbstractStereotypeExpressionAdapter() { + return null; + } + + /** * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.HasAppliedStereotypesExpression <em>Has Applied Stereotypes Expression</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; @@ -185,6 +213,20 @@ public class UMLExpressionsAdapterFactory extends AdapterFactoryImpl { } /** + * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.AbstractUMLEClassExpression <em>Abstract UMLE Class 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.uml.expressions.umlexpressions.AbstractUMLEClassExpression + * @generated + */ + public Adapter createAbstractUMLEClassExpressionAdapter() { + return null; + } + + /** * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfExpression <em>Is Kind Of Expression</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; @@ -227,6 +269,20 @@ public class UMLExpressionsAdapterFactory extends AdapterFactoryImpl { } /** + * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression <em>Single Stereotype Attribute Equality 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.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression + * @generated + */ + public Adapter createSingleStereotypeAttributeEqualityExpressionAdapter() { + return null; + } + + /** * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.expressions.IBasicExpressionElement <em>IBasic Expression Element</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/util/UMLExpressionsSwitch.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/util/UMLExpressionsSwitch.java index f1d5d054de5..616fbcd32ae 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/util/UMLExpressionsSwitch.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/util/UMLExpressionsSwitch.java @@ -1,16 +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/ * - * 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 + * SPDX-License-Identifier: EPL-2.0 * - * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation */ package org.eclipse.papyrus.uml.expressions.umlexpressions.util; @@ -18,10 +17,13 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.util.Switch; + import org.eclipse.papyrus.infra.emf.expressions.IBasicExpressionElement; import org.eclipse.papyrus.infra.emf.expressions.IExpression; + import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression; import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanExpression; + import org.eclipse.papyrus.uml.expressions.umlexpressions.*; /** @@ -84,6 +86,7 @@ public class UMLExpressionsSwitch<T> extends Switch<T> { case UMLExpressionsPackage.IS_STEREOTYPED_WITH_EXPRESSION: { IsStereotypedWithExpression isStereotypedWithExpression = (IsStereotypedWithExpression)theEObject; T result = caseIsStereotypedWithExpression(isStereotypedWithExpression); + if (result == null) result = caseAbstractStereotypeExpression(isStereotypedWithExpression); if (result == null) result = caseIBooleanEObjectExpression(isStereotypedWithExpression); if (result == null) result = caseIBooleanExpression(isStereotypedWithExpression); if (result == null) result = caseIExpression(isStereotypedWithExpression); @@ -91,6 +94,16 @@ public class UMLExpressionsSwitch<T> extends Switch<T> { if (result == null) result = defaultCase(theEObject); return result; } + case UMLExpressionsPackage.ABSTRACT_STEREOTYPE_EXPRESSION: { + AbstractStereotypeExpression abstractStereotypeExpression = (AbstractStereotypeExpression)theEObject; + T result = caseAbstractStereotypeExpression(abstractStereotypeExpression); + if (result == null) result = caseIBooleanEObjectExpression(abstractStereotypeExpression); + if (result == null) result = caseIBooleanExpression(abstractStereotypeExpression); + if (result == null) result = caseIExpression(abstractStereotypeExpression); + if (result == null) result = caseIBasicExpressionElement(abstractStereotypeExpression); + if (result == null) result = defaultCase(theEObject); + return result; + } case UMLExpressionsPackage.HAS_APPLIED_STEREOTYPES_EXPRESSION: { HasAppliedStereotypesExpression hasAppliedStereotypesExpression = (HasAppliedStereotypesExpression)theEObject; T result = caseHasAppliedStereotypesExpression(hasAppliedStereotypesExpression); @@ -104,6 +117,7 @@ public class UMLExpressionsSwitch<T> extends Switch<T> { case UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION: { IsTypeOfExpression isTypeOfExpression = (IsTypeOfExpression)theEObject; T result = caseIsTypeOfExpression(isTypeOfExpression); + if (result == null) result = caseAbstractUMLEClassExpression(isTypeOfExpression); if (result == null) result = caseIBooleanEObjectExpression(isTypeOfExpression); if (result == null) result = caseIBooleanExpression(isTypeOfExpression); if (result == null) result = caseIExpression(isTypeOfExpression); @@ -111,9 +125,20 @@ public class UMLExpressionsSwitch<T> extends Switch<T> { if (result == null) result = defaultCase(theEObject); return result; } + case UMLExpressionsPackage.ABSTRACT_UMLE_CLASS_EXPRESSION: { + AbstractUMLEClassExpression abstractUMLEClassExpression = (AbstractUMLEClassExpression)theEObject; + T result = caseAbstractUMLEClassExpression(abstractUMLEClassExpression); + if (result == null) result = caseIBooleanEObjectExpression(abstractUMLEClassExpression); + if (result == null) result = caseIBooleanExpression(abstractUMLEClassExpression); + if (result == null) result = caseIExpression(abstractUMLEClassExpression); + if (result == null) result = caseIBasicExpressionElement(abstractUMLEClassExpression); + if (result == null) result = defaultCase(theEObject); + return result; + } case UMLExpressionsPackage.IS_KIND_OF_EXPRESSION: { IsKindOfExpression isKindOfExpression = (IsKindOfExpression)theEObject; T result = caseIsKindOfExpression(isKindOfExpression); + if (result == null) result = caseAbstractUMLEClassExpression(isKindOfExpression); if (result == null) result = caseIBooleanEObjectExpression(isKindOfExpression); if (result == null) result = caseIBooleanExpression(isKindOfExpression); if (result == null) result = caseIExpression(isKindOfExpression); @@ -124,6 +149,7 @@ public class UMLExpressionsSwitch<T> extends Switch<T> { case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION: { IsKindOfStereotypeExpression isKindOfStereotypeExpression = (IsKindOfStereotypeExpression)theEObject; T result = caseIsKindOfStereotypeExpression(isKindOfStereotypeExpression); + if (result == null) result = caseAbstractStereotypeExpression(isKindOfStereotypeExpression); if (result == null) result = caseIBooleanEObjectExpression(isKindOfStereotypeExpression); if (result == null) result = caseIBooleanExpression(isKindOfStereotypeExpression); if (result == null) result = caseIExpression(isKindOfStereotypeExpression); @@ -134,6 +160,7 @@ public class UMLExpressionsSwitch<T> extends Switch<T> { case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION: { IsTypeOfStereotypeExpression isTypeOfStereotypeExpression = (IsTypeOfStereotypeExpression)theEObject; T result = caseIsTypeOfStereotypeExpression(isTypeOfStereotypeExpression); + if (result == null) result = caseAbstractStereotypeExpression(isTypeOfStereotypeExpression); if (result == null) result = caseIBooleanEObjectExpression(isTypeOfStereotypeExpression); if (result == null) result = caseIBooleanExpression(isTypeOfStereotypeExpression); if (result == null) result = caseIExpression(isTypeOfStereotypeExpression); @@ -141,6 +168,17 @@ public class UMLExpressionsSwitch<T> extends Switch<T> { if (result == null) result = defaultCase(theEObject); return result; } + case UMLExpressionsPackage.SINGLE_STEREOTYPE_ATTRIBUTE_EQUALITY_EXPRESSION: { + SingleStereotypeAttributeEqualityExpression singleStereotypeAttributeEqualityExpression = (SingleStereotypeAttributeEqualityExpression)theEObject; + T result = caseSingleStereotypeAttributeEqualityExpression(singleStereotypeAttributeEqualityExpression); + if (result == null) result = caseAbstractStereotypeExpression(singleStereotypeAttributeEqualityExpression); + if (result == null) result = caseIBooleanEObjectExpression(singleStereotypeAttributeEqualityExpression); + if (result == null) result = caseIBooleanExpression(singleStereotypeAttributeEqualityExpression); + if (result == null) result = caseIExpression(singleStereotypeAttributeEqualityExpression); + if (result == null) result = caseIBasicExpressionElement(singleStereotypeAttributeEqualityExpression); + if (result == null) result = defaultCase(theEObject); + return result; + } default: return defaultCase(theEObject); } } @@ -161,6 +199,21 @@ public class UMLExpressionsSwitch<T> extends Switch<T> { } /** + * Returns the result of interpreting the object as an instance of '<em>Abstract Stereotype 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 Stereotype Expression</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseAbstractStereotypeExpression(AbstractStereotypeExpression object) { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>Has Applied Stereotypes Expression</em>'. * <!-- begin-user-doc --> * This implementation returns null; @@ -191,6 +244,21 @@ public class UMLExpressionsSwitch<T> extends Switch<T> { } /** + * Returns the result of interpreting the object as an instance of '<em>Abstract UMLE Class 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 UMLE Class Expression</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseAbstractUMLEClassExpression(AbstractUMLEClassExpression object) { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>Is Kind Of Expression</em>'. * <!-- begin-user-doc --> * This implementation returns null; @@ -236,6 +304,21 @@ public class UMLExpressionsSwitch<T> extends Switch<T> { } /** + * Returns the result of interpreting the object as an instance of '<em>Single Stereotype Attribute Equality 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>Single Stereotype Attribute Equality Expression</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseSingleStereotypeAttributeEqualityExpression(SingleStereotypeAttributeEqualityExpression object) { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>IBasic Expression Element</em>'. * <!-- begin-user-doc --> * This implementation returns null; diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomIsKindOfStereotypeExpression.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomIsKindOfStereotypeExpression.java index 13bf4e2b96d..d0bf6521fc9 100644 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomIsKindOfStereotypeExpression.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomIsKindOfStereotypeExpression.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -9,8 +9,8 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * CEA LIST - Initial API and implementation - * + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * *****************************************************************************/ package org.eclipse.papyrus.uml.expressions.umlexpressions.custom; diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomIsTypeOfStereotypeExpression.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomIsTypeOfStereotypeExpression.java index 4f86b251e15..d1df8dbe3d1 100644 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomIsTypeOfStereotypeExpression.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomIsTypeOfStereotypeExpression.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -9,8 +9,8 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * CEA LIST - Initial API and implementation - * + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * *****************************************************************************/ package org.eclipse.papyrus.uml.expressions.umlexpressions.custom; @@ -24,8 +24,7 @@ import org.eclipse.uml2.uml.Element; import org.eclipse.uml2.uml.Stereotype; /** - * @author as247872 - * + * Custom implementation for {@link IsTypeOfStereotypeExpressionImpl} */ public class CustomIsTypeOfStereotypeExpression extends IsTypeOfStereotypeExpressionImpl { @@ -37,7 +36,7 @@ public class CustomIsTypeOfStereotypeExpression extends IsTypeOfStereotypeExpres */ @Override public Boolean evaluate(EObject context) { - + boolean result = false; if (null != this.stereotypeQualifiedName && !this.stereotypeQualifiedName.isEmpty() && context instanceof Element) { final Element el = (Element) context; diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomSingleStereotypeAttributeEqualityExpression.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomSingleStereotypeAttributeEqualityExpression.java new file mode 100755 index 00000000000..d5e61a9e8e5 --- /dev/null +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomSingleStereotypeAttributeEqualityExpression.java @@ -0,0 +1,95 @@ +/** + * Copyright (c) 2019 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.uml.expressions.umlexpressions.custom; + +import java.util.Iterator; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.papyrus.uml.expressions.umlexpressions.impl.SingleStereotypeAttributeEqualityExpressionImpl; +import org.eclipse.papyrus.uml.expressions.umlexpressions.utils.UMLExpressionsUtils; +import org.eclipse.uml2.uml.Element; +import org.eclipse.uml2.uml.Stereotype; + +/** + * Custom implementation for {@link SingleStereotypeAttributeEqualityExpressionImpl} + */ +public class CustomSingleStereotypeAttributeEqualityExpression extends SingleStereotypeAttributeEqualityExpressionImpl { + + /** + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.SingleStereotypeAttributeEqualityExpressionImpl#evaluate(org.eclipse.emf.ecore.EObject) + * + * @param context + * @return + */ + @Override + public Boolean evaluate(final EObject context) { + boolean result = false; + if (context instanceof Element) { + if (null != this.propertyName && !this.propertyName.isEmpty()) { + final Stereotype stereotype = getStereotype(context); + if (null != stereotype) { + final EObject steApp = ((Element) context).getStereotypeApplication(stereotype); + final EClass steAppEClass = steApp.eClass(); + final EStructuralFeature feature = steAppEClass.getEStructuralFeature(this.propertyName); + if (feature instanceof EAttribute && !feature.isMany()) { + final Object value = steApp.eGet(feature); + if (expectedValue == value) { + result = true; + } else if (expectedValue != null) { + return result = this.expectedValue.equals(value.toString()); + } + + } + } + } + } + return Boolean.valueOf(result); + } + + /** + * + * @param context + * the context used to make the evaluation + * @return + * the Stereotype matching the configuration of the expression + */ + private Stereotype getStereotype(final EObject context) { + if (null != this.stereotypeQualifiedName + && !this.stereotypeQualifiedName.isEmpty() + && context instanceof Element) { + final Element el = (Element) context; + final Iterator<Stereotype> iter = el.getAppliedStereotypes().iterator(); + while (iter.hasNext()) { + final Stereotype current = iter.next(); + if (this.stereotypeQualifiedName.equals(current.getQualifiedName())) { + if (null != this.profileURI + && !this.profileURI.isEmpty()) { + // we use the uri of the top profile, because often the subprofiles don't have defined uri + if (profileURI.equals(UMLExpressionsUtils.getTopProfileURI(current))) { + return current; + } + } else { + return current; + } + } + } + } + return null; + } +} diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomUMLExpressionsFactory.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomUMLExpressionsFactory.java index 41f554077b9..0d673e957cc 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomUMLExpressionsFactory.java +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomUMLExpressionsFactory.java @@ -1,14 +1,14 @@ /** * 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 */ @@ -20,10 +20,11 @@ import org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpr import org.eclipse.papyrus.uml.expressions.umlexpressions.IsStereotypedWithExpression; import org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfExpression; import org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression; +import org.eclipse.papyrus.uml.expressions.umlexpressions.SingleStereotypeAttributeEqualityExpression; import org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsFactoryImpl; /** - * + * * Override the default implementation of the generated class * */ @@ -70,28 +71,37 @@ public class CustomUMLExpressionsFactory extends UMLExpressionsFactoryImpl { public IsTypeOfExpression createIsTypeOfExpression() { return new CustomIsTypeOfExpression(); } - + /*** - * + * * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsFactoryImpl#createIsKindOfStereotypeExpression() * * @return */ @Override public IsKindOfStereotypeExpression createIsKindOfStereotypeExpression() { - return new CustomIsKindOfStereotypeExpression(); } /*** - * + * * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsFactoryImpl#createIsTypeOfStereotypeExpression() * * @return */ @Override public IsTypeOfStereotypeExpression createIsTypeOfStereotypeExpression() { - return new CustomIsTypeOfStereotypeExpression(); } + + /** + * + * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsFactoryImpl#createSingleStereotypeAttributeEqualityExpression() + * + * @return + */ + @Override + public SingleStereotypeAttributeEqualityExpression createSingleStereotypeAttributeEqualityExpression() { + return new CustomSingleStereotypeAttributeEqualityExpression(); + } } |
