Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsma Smaoui2017-10-17 18:05:50 -0400
committervincent lorenzo2017-10-18 10:09:31 -0400
commit70620f53bcbc17d4e8e5bcb59e2750f8dad1a235 (patch)
treeb89871a90cee83f0f805312f9b8f5b9348159891
parent0179002f8011b07b30d4136883d911ff715770dc (diff)
downloadorg.eclipse.papyrus-70620f53bcbc17d4e8e5bcb59e2750f8dad1a235.tar.gz
org.eclipse.papyrus-70620f53bcbc17d4e8e5bcb59e2750f8dad1a235.tar.xz
org.eclipse.papyrus-70620f53bcbc17d4e8e5bcb59e2750f8dad1a235.zip
Bug 526009 - [Matrix][Filter] add new UML Expressions to manage the case
of inherited Stereotype * change pom.xml * remove reexport from manisfest.mf * add doc * use API Baseline to increment the plugins version and update all depending plugins versions too * add icons to both added uml expressions * reset to platform:/plugin in ctx file * update the uml expressions MM * re generate code * add custom code * update properties * add junit test Change-Id: I42eceb584011d267488da517ad799fe542566824 Signed-off-by: Asma Smaoui <asma.smaoui@cea.fr>
-rwxr-xr-xplugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/src/site/mediawiki/expressionsUserDoc.mediawiki16
-rwxr-xr-xplugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/src/site/mediawiki/images/UMLExpressionsClassDiagram.PNGbin52368 -> 54612 bytes
-rwxr-xr-xplugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/META-INF/MANIFEST.MF2
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/META-INF/MANIFEST.MF4
-rw-r--r--plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/icons/full/obj16/IsKindOfStereotypeExpression.gifbin0 -> 901 bytes
-rw-r--r--plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/icons/full/obj16/IsTypeOfStereotypeExpression.gifbin0 -> 888 bytes
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/plugin.properties6
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/pom.xml2
-rw-r--r--plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsKindOfStereotypeExpressionItemProvider.java251
-rw-r--r--plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsTypeOfStereotypeExpressionItemProvider.java251
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/UMLExpressionsItemProviderAdapterFactory.java92
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleIsKindOfStereotypeExpression.xwt18
-rw-r--r--plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleIsTypeOfStereotypeExpression.xwt18
-rw-r--r--plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsKindOfStereotypeExpression.xwt28
-rw-r--r--plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsTypeOfStereotypeExpression.xwt28
-rw-r--r--[-rwxr-xr-x]plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/umlexpressions.ctx278
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions/META-INF/MANIFEST.MF2
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.ecore18
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.genmodel8
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.notation720
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions/model/umlexpressions.uml222
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions/pom.xml2
-rw-r--r--plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsKindOfStereotypeExpression.java93
-rw-r--r--plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsTypeOfStereotypeExpression.java93
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/UMLExpressionsFactory.java18
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/UMLExpressionsPackage.java262
-rw-r--r--plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsKindOfStereotypeExpressionImpl.java361
-rw-r--r--plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsTypeOfStereotypeExpressionImpl.java361
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/UMLExpressionsFactoryImpl.java22
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/UMLExpressionsPackageImpl.java88
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/util/UMLExpressionsAdapterFactory.java36
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/util/UMLExpressionsSwitch.java50
-rw-r--r--plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomIsKindOfStereotypeExpression.java82
-rw-r--r--plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomIsTypeOfStereotypeExpression.java59
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomUMLExpressionsFactory.java26
-rwxr-xr-xplugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF2
-rwxr-xr-xtests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/META-INF/MANIFEST.MF2
-rwxr-xr-xtests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.notation298
-rwxr-xr-xtests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.uml80
-rwxr-xr-xtests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.notation261
-rwxr-xr-xtests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.uml291
-rw-r--r--tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/src/org/eclipse/papyrus/uml/expressions/tests/IsKindOfStereotypeExpressionTests.java308
-rw-r--r--tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/src/org/eclipse/papyrus/uml/expressions/tests/IsTypeOfStereotypeExpressionTests.java284
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/META-INF/MANIFEST.MF2
45 files changed, 4141 insertions, 906 deletions
diff --git a/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/src/site/mediawiki/expressionsUserDoc.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/src/site/mediawiki/expressionsUserDoc.mediawiki
index eaa244120a7..28aaac6c0b4 100755
--- a/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/src/site/mediawiki/expressionsUserDoc.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/src/site/mediawiki/expressionsUserDoc.mediawiki
@@ -76,3 +76,19 @@ After defining these main objects required to write boolean expression, we provi
***''UML Metaclass'': the expected UML metaclass.
**semantic: returns <code>true</code> when the evaluated element is an instance of the excepted metaclass. So for subtypes, of the expected metaclass, we return <code>true</code> too.
**default value: we return <code>false</code> when the ''UML Metaclass'' is not defined.
+
+*'''IsTypeOfStereotypeExpression'''
+**parameters:
+***''stereotype identifier'': the qualified name of the stereotype,
+***''profile URI'': the URI of the top profile owning the stereotype, not mandatory.
+**semantic: this expression returns <code>true</code> when the stereotype is applied on the element. If the ''profile URI'' is defined, we check that the stereotype comes from the expected profile.
+**default value:
+*** we return <code>false</code>, if the stereotype identifier is not defined.
+
+*'''IsKindOfStereotypeExpression'''
+**parameters:
+***''stereotype identifier'': the qualified name of the stereotype,
+***''profile URI'': the URI of the top profile owning the stereotype, not mandatory.
+**semantic: this expression returns <code>true</code> when the stereotype applied on the context element is a Kind of the identified stereotype. So for element stereotyped by a stereotype that generalize the expected stereotype, we return <code>true</code>. If the ''profile URI'' is defined, we check that the stereotype comes from the expected profile.
+**default value:
+*** we return <code>false</code>, if the stereotype identifier is not defined.
diff --git a/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/src/site/mediawiki/images/UMLExpressionsClassDiagram.PNG b/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/src/site/mediawiki/images/UMLExpressionsClassDiagram.PNG
index b32c3b552a0..3747feb9b84 100755
--- a/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/src/site/mediawiki/images/UMLExpressionsClassDiagram.PNG
+++ b/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/src/site/mediawiki/images/UMLExpressionsClassDiagram.PNG
Binary files differ
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/META-INF/MANIFEST.MF
index 7ead800ae43..814653812a8 100755
--- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
org.eclipse.ui.workbench;bundle-version="[3.110.0,4.0.0)",
org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
- org.eclipse.papyrus.uml.expressions;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.expressions;bundle-version="[2.0.0,3.0.0)",
org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
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 ac5963310a7..cd60af48a37 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: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.papyrus.uml.expressions.umlexpressions.provider.UmlexpressionsEditPlugin$Implementation
Bundle-Vendor: %providerName
@@ -10,7 +10,7 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.papyrus.uml.expressions.umlexpressions.provider
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.papyrus.uml.expressions;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.expressions;bundle-version="[2.0.0,3.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)",
diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/icons/full/obj16/IsKindOfStereotypeExpression.gif b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/icons/full/obj16/IsKindOfStereotypeExpression.gif
new file mode 100644
index 00000000000..02931df6fe4
--- /dev/null
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/icons/full/obj16/IsKindOfStereotypeExpression.gif
Binary files differ
diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/icons/full/obj16/IsTypeOfStereotypeExpression.gif b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/icons/full/obj16/IsTypeOfStereotypeExpression.gif
new file mode 100644
index 00000000000..9a66ee84295
--- /dev/null
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/icons/full/obj16/IsTypeOfStereotypeExpression.gif
Binary files differ
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 a722b5dd3ec..5790497f8f4 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
@@ -36,3 +36,9 @@ _UI_IsTypeOfExpression_type = Is Type Of 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
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 aac946a1d9d..1b78c9e8ebf 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>1.0.0-SNAPSHOT</version>
+ <version>2.0.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/IsKindOfStereotypeExpressionItemProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsKindOfStereotypeExpressionItemProvider.java
new file mode 100644
index 00000000000..ff3cde47c87
--- /dev/null
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsKindOfStereotypeExpressionItemProvider.java
@@ -0,0 +1,251 @@
+/**
+ * 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 v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * 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.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.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class IsKindOfStereotypeExpressionItemProvider
+ 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 IsKindOfStereotypeExpressionItemProvider(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_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 -->
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/IsKindOfStereotypeExpression")); //$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 = ((IsKindOfStereotypeExpression)object).getName();
+ return label == null || label.length() == 0 ?
+ 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
+ * 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(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);
+ }
+
+ /**
+ * 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/IsTypeOfStereotypeExpressionItemProvider.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsTypeOfStereotypeExpressionItemProvider.java
new file mode 100644
index 00000000000..f1940ce2d30
--- /dev/null
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/IsTypeOfStereotypeExpressionItemProvider.java
@@ -0,0 +1,251 @@
+/**
+ * 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 v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * 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.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.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class IsTypeOfStereotypeExpressionItemProvider
+ 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 IsTypeOfStereotypeExpressionItemProvider(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_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 -->
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/IsTypeOfStereotypeExpression")); //$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 = ((IsTypeOfStereotypeExpression)object).getName();
+ return label == null || label.length() == 0 ?
+ 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
+ * 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(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);
+ }
+
+ /**
+ * 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/UMLExpressionsItemProviderAdapterFactory.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/provider/UMLExpressionsItemProviderAdapterFactory.java
index 23a3900b80e..5e21e7bc19c 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
@@ -37,7 +37,6 @@ 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.AndExpression;
@@ -199,6 +198,52 @@ public class UMLExpressionsItemProviderAdapterFactory extends UMLExpressionsAdap
}
/**
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression} instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IsKindOfStereotypeExpressionItemProvider isKindOfStereotypeExpressionItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Adapter createIsKindOfStereotypeExpressionAdapter() {
+ if (isKindOfStereotypeExpressionItemProvider == null) {
+ isKindOfStereotypeExpressionItemProvider = new IsKindOfStereotypeExpressionItemProvider(this);
+ }
+
+ return isKindOfStereotypeExpressionItemProvider;
+ }
+
+ /**
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression} instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IsTypeOfStereotypeExpressionItemProvider isTypeOfStereotypeExpressionItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Adapter createIsTypeOfStereotypeExpressionAdapter() {
+ if (isTypeOfStereotypeExpressionItemProvider == null) {
+ isTypeOfStereotypeExpressionItemProvider = new IsTypeOfStereotypeExpressionItemProvider(this);
+ }
+
+ return isTypeOfStereotypeExpressionItemProvider;
+ }
+
+ /**
* This returns the root adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -328,6 +373,8 @@ public class UMLExpressionsItemProviderAdapterFactory extends UMLExpressionsAdap
if (hasAppliedStereotypesExpressionItemProvider != null) hasAppliedStereotypesExpressionItemProvider.dispose();
if (isTypeOfExpressionItemProvider != null) isTypeOfExpressionItemProvider.dispose();
if (isKindOfExpressionItemProvider != null) isKindOfExpressionItemProvider.dispose();
+ if (isKindOfStereotypeExpressionItemProvider != null) isKindOfStereotypeExpressionItemProvider.dispose();
+ if (isTypeOfStereotypeExpressionItemProvider != null) isTypeOfStereotypeExpressionItemProvider.dispose();
}
/**
@@ -397,6 +444,16 @@ public class UMLExpressionsItemProviderAdapterFactory extends UMLExpressionsAdap
(ExpressionsPackage.Literals.EXPRESSION_CATALOG__EXPRESSIONS,
UMLExpressionsFactory.eINSTANCE.createIsKindOfExpression()));
+ newChildDescriptors.add
+ (createChildParameter
+ (ExpressionsPackage.Literals.EXPRESSION_CATALOG__EXPRESSIONS,
+ UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (ExpressionsPackage.Literals.EXPRESSION_CATALOG__EXPRESSIONS,
+ UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression()));
+
return null;
}
@@ -499,8 +556,19 @@ public class UMLExpressionsItemProviderAdapterFactory extends UMLExpressionsAdap
(BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS,
UMLExpressionsFactory.eINSTANCE.createIsKindOfExpression()));
+ newChildDescriptors.add
+ (createChildParameter
+ (BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS,
+ UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (BooleanExpressionsPackage.Literals.OR_EXPRESSION__OWNED_EXPRESSIONS,
+ UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression()));
+
return null;
}
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -528,8 +596,19 @@ public class UMLExpressionsItemProviderAdapterFactory extends UMLExpressionsAdap
(BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS,
UMLExpressionsFactory.eINSTANCE.createIsKindOfExpression()));
+ newChildDescriptors.add
+ (createChildParameter
+ (BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS,
+ UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (BooleanExpressionsPackage.Literals.AND_EXPRESSION__OWNED_EXPRESSIONS,
+ UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression()));
+
return null;
}
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -557,8 +636,19 @@ public class UMLExpressionsItemProviderAdapterFactory extends UMLExpressionsAdap
(BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION,
UMLExpressionsFactory.eINSTANCE.createIsKindOfExpression()));
+ newChildDescriptors.add
+ (createChildParameter
+ (BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION,
+ UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (BooleanExpressionsPackage.Literals.NOT_EXPRESSION__OWNED_EXPRESSION,
+ UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression()));
+
return null;
}
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/META-INF/MANIFEST.MF b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/META-INF/MANIFEST.MF
index 94dae06a97b..a2023ce8b3b 100755
--- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.
org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.expressions;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.expressions;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)"
Bundle-Activator: org.eclipse.papyrus.uml.expressions.properties.Activator
Bundle-Description: This plugin provides properties views for the UML Expressions.
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
new file mode 100644
index 00000000000..4aaaf2af2bf
--- /dev/null
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleIsKindOfStereotypeExpression.xwt
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+ xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+ xmlns:x="http://www.eclipse.org/xwt">
+ <Composite.layout>
+ <ppel:PropertiesLayout></ppel:PropertiesLayout>
+ </Composite.layout>
+ <Composite>
+ <Composite.layout>
+ <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+ </Composite.layout>
+ <ppe:StringEditor input="{Binding}"
+ property="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
new file mode 100644
index 00000000000..e870bacbf96
--- /dev/null
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/MultipleIsTypeOfStereotypeExpression.xwt
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+ xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+ xmlns:x="http://www.eclipse.org/xwt">
+ <Composite.layout>
+ <ppel:PropertiesLayout></ppel:PropertiesLayout>
+ </Composite.layout>
+ <Composite>
+ <Composite.layout>
+ <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+ </Composite.layout>
+ <ppe:StringEditor input="{Binding}"
+ property="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/SingleIsKindOfStereotypeExpression.xwt b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsKindOfStereotypeExpression.xwt
new file mode 100644
index 00000000000..98fe3568571
--- /dev/null
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsKindOfStereotypeExpression.xwt
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+ xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+ xmlns:x="http://www.eclipse.org/xwt">
+ <Composite.layout>
+ <ppel:PropertiesLayout></ppel:PropertiesLayout>
+ </Composite.layout>
+ <Composite>
+ <Composite.layout>
+ <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+ </Composite.layout>
+ <ppe:StringEditor input="{Binding}"
+ property="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>
+ </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
new file mode 100644
index 00000000000..3bd396802d1
--- /dev/null
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/properties/ui/SingleIsTypeOfStereotypeExpression.xwt
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+ xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+ xmlns:x="http://www.eclipse.org/xwt">
+ <Composite.layout>
+ <ppel:PropertiesLayout></ppel:PropertiesLayout>
+ </Composite.layout>
+ <Composite>
+ <Composite.layout>
+ <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+ </Composite.layout>
+ <ppe:StringEditor input="{Binding}"
+ property="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>
+ </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 91bdefd9b29..054cd06f5e9 100755..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,114 +1,164 @@
-<?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">
- <widget href="ui/SingleIsStereotypedWithExpression.xwt#/"/>
- </sections>
- <sections xmi:id="_xcGOsizsEeeKOdJYr-htag" 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">
- <widget href="ui/SingleIsTypeOfExpression.xwt#/"/>
- </sections>
- <sections xmi:id="_xcG1wCzsEeeKOdJYr-htag" 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">
- <widget href="ui/MultipleIsStereotypedWithExpression.xwt#/"/>
- </sections>
- <sections xmi:id="_xcG1wizsEeeKOdJYr-htag" 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">
- <widget href="ui/MultipleIsTypeOfExpression.xwt#/"/>
- </sections>
- <sections xmi:id="_xcG1xCzsEeeKOdJYr-htag" name="Multiple IsKindOfExpression" sectionFile="ui/MultipleIsKindOfExpression.xwt">
- <widget href="ui/MultipleIsKindOfExpression.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">
- <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"/>
- </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">
- <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"/>
- </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">
- <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"/>
- </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">
- <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"/>
- </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">
- <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"/>
- </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">
- <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"/>
- </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">
- <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"/>
- </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">
- <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"/>
- </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.&#xD;&#xA;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>
- <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>
- <elements xmi:id="_8n4KoizsEeeKOdJYr-htag" name="CustomIsKindOfExpression" supertypes="_wsjoSCzsEeeKOdJYr-htag">
- <properties xmi:id="_8n4KoyzsEeeKOdJYr-htag" name="umlEClass" type="Reference"/>
- </elements>
- <modelElementFactory href="Environment.xmi#//@modelElementFactories.0"/>
- </dataContexts>
-</contexts:Context>
+<?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">
+ <widget href="ui/SingleIsStereotypedWithExpression.xwt#/"/>
+ </sections>
+ <sections xmi:id="_xcGOsizsEeeKOdJYr-htag" 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">
+ <widget href="ui/SingleIsTypeOfExpression.xwt#/"/>
+ </sections>
+ <sections xmi:id="_xcG1wCzsEeeKOdJYr-htag" 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">
+ <widget href="ui/MultipleIsStereotypedWithExpression.xwt#/"/>
+ </sections>
+ <sections xmi:id="_xcG1wizsEeeKOdJYr-htag" 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">
+ <widget href="ui/MultipleIsTypeOfExpression.xwt#/"/>
+ </sections>
+ <sections xmi:id="_xcG1xCzsEeeKOdJYr-htag" name="Multiple IsKindOfExpression" sectionFile="ui/MultipleIsKindOfExpression.xwt">
+ <widget href="ui/MultipleIsKindOfExpression.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>
+ <sections xmi:id="_4_Dq6K_zEeeaV7Cy9TCK-g" 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">
+ <widget href="ui/MultipleIsTypeOfStereotypeExpression.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">
+ <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"/>
+ </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">
+ <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"/>
+ </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">
+ <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"/>
+ </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">
+ <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"/>
+ </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">
+ <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"/>
+ </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">
+ <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"/>
+ </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">
+ <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"/>
+ </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">
+ <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"/>
+ </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">
+ <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"/>
+ </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">
+ <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"/>
+ </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">
+ <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"/>
+ </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">
+ <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"/>
+ </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.&#xD;&#xA;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"/>
+ </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>
+ <elements xmi:id="_8n4KoizsEeeKOdJYr-htag" name="CustomIsKindOfExpression" supertypes="_wsjoSCzsEeeKOdJYr-htag">
+ <properties xmi:id="_8n4KoyzsEeeKOdJYr-htag" name="umlEClass" type="Reference"/>
+ </elements>
+ <modelElementFactory href="Environment.xmi#//@modelElementFactories.0"/>
+ </dataContexts>
+</contexts:Context>
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 801c00e9126..29dd5236e2e 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: 1.0.0.qualifier
+Bundle-Version: 2.0.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 4436d49e5db..324ec91c85e 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
@@ -41,4 +41,22 @@
<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">
+ <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.&#xD;&#xA;The evaluate method returns TRUE when the object is stereotyped by the stereotype identified by its qualified name&#xD;&#xA;"/>
+ </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">
+ <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.&#xD;&#xA;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&#xD;&#xA;"/>
+ </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>
</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 58bbd0387bb..6797ac3327d 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
@@ -50,5 +50,13 @@
<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>
</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 11a2fd57abe..c269398385b 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
@@ -1,276 +1,444 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
- <notation:Diagram xmi:id="_IsaTkCTWEeehXLEpOVl1Ig" type="PapyrusUMLClassDiagram" name="UMLExpressionsClassDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_2WWFwCTWEeehXLEpOVl1Ig" type="Interface_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_2WkIMCTWEeehXLEpOVl1Ig" type="Interface_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_2WkIMSTWEeehXLEpOVl1Ig" type="Interface_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_2WkIMiTWEeehXLEpOVl1Ig" y="15"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_2WkIMyTWEeehXLEpOVl1Ig" type="Interface_AttributeCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_2WkINCTWEeehXLEpOVl1Ig"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_2WkINSTWEeehXLEpOVl1Ig"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_2WkINiTWEeehXLEpOVl1Ig"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WkINyTWEeehXLEpOVl1Ig"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_2WkIOCTWEeehXLEpOVl1Ig" type="Interface_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_2WkIOSTWEeehXLEpOVl1Ig"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_2WkIOiTWEeehXLEpOVl1Ig"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_2WkIOyTWEeehXLEpOVl1Ig"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WkIPCTWEeehXLEpOVl1Ig"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_2WkvQCTWEeehXLEpOVl1Ig" type="Interface_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_2WkvQSTWEeehXLEpOVl1Ig"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_2WkvQiTWEeehXLEpOVl1Ig"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_2WkvQyTWEeehXLEpOVl1Ig"/>
- <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="480" y="80"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_7sdO0CTWEeehXLEpOVl1Ig" type="Class_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_7sec8CTWEeehXLEpOVl1Ig" type="Class_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_7sec8STWEeehXLEpOVl1Ig" type="Class_FloatingNameLabel">
- <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>
- <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>
- <styles xmi:type="notation:TitleStyle" xmi:id="_7sec9CTWEeehXLEpOVl1Ig"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_7sec9STWEeehXLEpOVl1Ig"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_7sec9iTWEeehXLEpOVl1Ig"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7sec9yTWEeehXLEpOVl1Ig"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_7sec-CTWEeehXLEpOVl1Ig" type="Class_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_7sec-STWEeehXLEpOVl1Ig"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_7sec-iTWEeehXLEpOVl1Ig"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_7sec-yTWEeehXLEpOVl1Ig"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7sec_CTWEeehXLEpOVl1Ig"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_7sfEACTWEeehXLEpOVl1Ig" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_7sfEASTWEeehXLEpOVl1Ig"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_7sfEAiTWEeehXLEpOVl1Ig"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_7sfEAyTWEeehXLEpOVl1Ig"/>
- <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="440" y="320" width="244"/>
- </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="440" y="600" width="244" height="181"/>
- </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"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_okabESslEeeV_fNySaALnw" type="Class_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_okabEislEeeV_fNySaALnw" y="15"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_okbCICslEeeV_fNySaALnw" type="Class_AttributeCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_okbCISslEeeV_fNySaALnw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_okbCIislEeeV_fNySaALnw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_okbCIyslEeeV_fNySaALnw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_okbCJCslEeeV_fNySaALnw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_okbpMCslEeeV_fNySaALnw" type="Class_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_okbpMSslEeeV_fNySaALnw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_okbpMislEeeV_fNySaALnw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_okbpMyslEeeV_fNySaALnw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_okbpNCslEeeV_fNySaALnw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_okbpNSslEeeV_fNySaALnw" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_okbpNislEeeV_fNySaALnw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_okbpNyslEeeV_fNySaALnw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_okbpOCslEeeV_fNySaALnw"/>
- <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="820" y="320" width="244" height="112"/>
- </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="760" y="600" width="541" height="100"/>
- </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"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_dbX34CzXEeeKOdJYr-htag" type="Class_FloatingNameLabel">
- <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>
- <styles xmi:type="notation:TitleStyle" xmi:id="_dbX34yzXEeeKOdJYr-htag"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_dbX35CzXEeeKOdJYr-htag"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_dbX35SzXEeeKOdJYr-htag"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dbX35izXEeeKOdJYr-htag"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_dbX35yzXEeeKOdJYr-htag" type="Class_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_dbX36CzXEeeKOdJYr-htag"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_dbX36SzXEeeKOdJYr-htag"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_dbX36izXEeeKOdJYr-htag"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dbX36yzXEeeKOdJYr-htag"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_dbX37CzXEeeKOdJYr-htag" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_dbYe8CzXEeeKOdJYr-htag"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_dbYe8SzXEeeKOdJYr-htag"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_dbYe8izXEeeKOdJYr-htag"/>
- <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="60" y="320" width="244" height="112"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_moJwgCzXEeeKOdJYr-htag" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_moJwgSzXEeeKOdJYr-htag"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_moK-oCzXEeeKOdJYr-htag" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="pathmap://EXPRESSIONS//expressions.uml#_LWXU4BoAEee5_t3XPJ6rjA"/>
- </styles>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_moJwgizXEeeKOdJYr-htag" x="200"/>
- </children>
- <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="60" y="600" width="241" height="101"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_89ygUCzYEeeKOdJYr-htag" type="Class_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_89zHYCzYEeeKOdJYr-htag" type="Class_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_89zHYSzYEeeKOdJYr-htag" type="Class_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_89zHYizYEeeKOdJYr-htag" y="15"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_89zHYyzYEeeKOdJYr-htag" type="Class_AttributeCompartment">
- <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>
- <styles xmi:type="notation:TitleStyle" xmi:id="_89zHZCzYEeeKOdJYr-htag"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_89zHZSzYEeeKOdJYr-htag"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_89zHZizYEeeKOdJYr-htag"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_89zHZyzYEeeKOdJYr-htag"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_89zucCzYEeeKOdJYr-htag" type="Class_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_89zucSzYEeeKOdJYr-htag"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_89zucizYEeeKOdJYr-htag"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_89zucyzYEeeKOdJYr-htag"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_89zudCzYEeeKOdJYr-htag"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_89zudSzYEeeKOdJYr-htag" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_89zudizYEeeKOdJYr-htag"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_89zudyzYEeeKOdJYr-htag"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_89zueCzYEeeKOdJYr-htag"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_89zueSzYEeeKOdJYr-htag"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_899fcCzYEeeKOdJYr-htag" type="compartment_shape_display">
- <styles xmi:type="notation:TitleStyle" xmi:id="_899fcSzYEeeKOdJYr-htag"/>
- <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="-260" y="320" width="244" height="112"/>
- </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="-260" y="600" width="241" height="101"/>
- </children>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_IsaTkSTWEeehXLEpOVl1Ig" name="diagram_compatibility_version" stringValue="1.3.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="[580, 400, -643984, -643984]$[580, 184, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DgX3ECTXEeehXLEpOVl1Ig" id="(0.4918032786885246,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DgX3ESTXEeehXLEpOVl1Ig" id="(0.49079754601226994,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="[520, 620, -643984, -643984]$[520, 500, -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.4918032786885246,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">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_sDGIcSslEeeV_fNySaALnw" y="60"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_sDGvgCslEeeV_fNySaALnw" type="InterfaceRealization_StereotypeLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_sDGvgSslEeeV_fNySaALnw" y="30"/>
- </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="[940, 320, -643984, -643984]$[560, 184, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sFRSsCslEeeV_fNySaALnw" id="(0.4918032786885246,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sFRSsSslEeeV_fNySaALnw" id="(0.49079754601226994,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.33271719038817005,0.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="[160, 320, -643984, -643984]$[160, 260, -643984, -643984]$[560, 260, -643984, -643984]$[560, 184, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vyVBECzXEeeKOdJYr-htag" id="(0.4918032786885246,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vyVBESzXEeeKOdJYr-htag" id="(0.49079754601226994,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.4979253112033195,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RgdvoCzYEeeKOdJYr-htag" id="(0.4918032786885246,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]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UxaGgCzZEeeKOdJYr-htag" id="(0.4979253112033195,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="[-160, 320, -643984, -643984]$[-160, 260, -643984, -643984]$[560, 260, -643984, -643984]$[560, 184, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fjw10CzZEeeKOdJYr-htag" id="(0.4149377593360996,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fjw10SzZEeeKOdJYr-htag" id="(0.49079754601226994,1.0)"/>
- </edges>
- </notation:Diagram>
- <css:ModelStyleSheets xmi:id="_-J2o4CTXEeehXLEpOVl1Ig">
- <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_CmRJ0CTYEeehXLEpOVl1Ig" path="/org.eclipse.papyrus.infra.emf.expressions/model/custom.css"/>
- </css:ModelStyleSheets>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+ <notation:Diagram xmi:id="_IsaTkCTWEeehXLEpOVl1Ig" type="PapyrusUMLClassDiagram" name="UMLExpressionsClassDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_2WWFwCTWEeehXLEpOVl1Ig" type="Interface_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_2WkIMCTWEeehXLEpOVl1Ig" type="Interface_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_2WkIMSTWEeehXLEpOVl1Ig" type="Interface_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_2WkIMiTWEeehXLEpOVl1Ig" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_2WkIMyTWEeehXLEpOVl1Ig" type="Interface_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_2WkINCTWEeehXLEpOVl1Ig"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_2WkINSTWEeehXLEpOVl1Ig"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_2WkINiTWEeehXLEpOVl1Ig"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WkINyTWEeehXLEpOVl1Ig"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_2WkIOCTWEeehXLEpOVl1Ig" type="Interface_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_2WkIOSTWEeehXLEpOVl1Ig"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_2WkIOiTWEeehXLEpOVl1Ig"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_2WkIOyTWEeehXLEpOVl1Ig"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WkIPCTWEeehXLEpOVl1Ig"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_2WkvQCTWEeehXLEpOVl1Ig" type="Interface_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_2WkvQSTWEeehXLEpOVl1Ig"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_2WkvQiTWEeehXLEpOVl1Ig"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_2WkvQyTWEeehXLEpOVl1Ig"/>
+ <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"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_7sdO0CTWEeehXLEpOVl1Ig" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_7sec8CTWEeehXLEpOVl1Ig" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_7sec8STWEeehXLEpOVl1Ig" type="Class_FloatingNameLabel">
+ <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>
+ <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>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7sec9CTWEeehXLEpOVl1Ig"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_7sec9STWEeehXLEpOVl1Ig"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_7sec9iTWEeehXLEpOVl1Ig"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7sec9yTWEeehXLEpOVl1Ig"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7sec-CTWEeehXLEpOVl1Ig" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7sec-STWEeehXLEpOVl1Ig"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_7sec-iTWEeehXLEpOVl1Ig"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_7sec-yTWEeehXLEpOVl1Ig"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7sec_CTWEeehXLEpOVl1Ig"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7sfEACTWEeehXLEpOVl1Ig" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7sfEASTWEeehXLEpOVl1Ig"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_7sfEAiTWEeehXLEpOVl1Ig"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_7sfEAyTWEeehXLEpOVl1Ig"/>
+ <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"/>
+ </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"/>
+ </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"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_okabESslEeeV_fNySaALnw" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_okabEislEeeV_fNySaALnw" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_okbCICslEeeV_fNySaALnw" type="Class_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_okbCISslEeeV_fNySaALnw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_okbCIislEeeV_fNySaALnw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_okbCIyslEeeV_fNySaALnw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_okbCJCslEeeV_fNySaALnw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_okbpMCslEeeV_fNySaALnw" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_okbpMSslEeeV_fNySaALnw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_okbpMislEeeV_fNySaALnw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_okbpMyslEeeV_fNySaALnw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_okbpNCslEeeV_fNySaALnw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_okbpNSslEeeV_fNySaALnw" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_okbpNislEeeV_fNySaALnw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_okbpNyslEeeV_fNySaALnw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_okbpOCslEeeV_fNySaALnw"/>
+ <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"/>
+ </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"/>
+ </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"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_dbX34CzXEeeKOdJYr-htag" type="Class_FloatingNameLabel">
+ <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>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_dbX34yzXEeeKOdJYr-htag"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_dbX35CzXEeeKOdJYr-htag"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_dbX35SzXEeeKOdJYr-htag"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dbX35izXEeeKOdJYr-htag"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_dbX35yzXEeeKOdJYr-htag" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_dbX36CzXEeeKOdJYr-htag"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_dbX36SzXEeeKOdJYr-htag"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_dbX36izXEeeKOdJYr-htag"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dbX36yzXEeeKOdJYr-htag"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_dbX37CzXEeeKOdJYr-htag" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_dbYe8CzXEeeKOdJYr-htag"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_dbYe8SzXEeeKOdJYr-htag"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_dbYe8izXEeeKOdJYr-htag"/>
+ <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"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_moJwgCzXEeeKOdJYr-htag" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_moJwgSzXEeeKOdJYr-htag"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_moK-oCzXEeeKOdJYr-htag" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Interface" href="pathmap://EXPRESSIONS//expressions.uml#_LWXU4BoAEee5_t3XPJ6rjA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_moJwgizXEeeKOdJYr-htag" x="200"/>
+ </children>
+ <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"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_89ygUCzYEeeKOdJYr-htag" type="Class_Shape">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LZoMC680EeemetdP4I8Ciw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LZoMDK80EeemetdP4I8Ciw" key="visible" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_89zHYCzYEeeKOdJYr-htag" type="Class_NameLabel">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LZoMDa80EeemetdP4I8Ciw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LZoMDq80EeemetdP4I8Ciw" key="visible" value="true"/>
+ </eAnnotations>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_89zHYSzYEeeKOdJYr-htag" type="Class_FloatingNameLabel">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LZoMD680EeemetdP4I8Ciw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LZoMEK80EeemetdP4I8Ciw" key="visible" value="true"/>
+ </eAnnotations>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_89zHYizYEeeKOdJYr-htag" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_89zHYyzYEeeKOdJYr-htag" type="Class_AttributeCompartment">
+ <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>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_89zHZCzYEeeKOdJYr-htag"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_89zHZSzYEeeKOdJYr-htag"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_89zHZizYEeeKOdJYr-htag"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_89zHZyzYEeeKOdJYr-htag"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_89zucCzYEeeKOdJYr-htag" type="Class_OperationCompartment">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LZoME680EeemetdP4I8Ciw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LZoMFK80EeemetdP4I8Ciw" key="visible" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_89zucSzYEeeKOdJYr-htag"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_89zucizYEeeKOdJYr-htag"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_89zucyzYEeeKOdJYr-htag"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_89zudCzYEeeKOdJYr-htag"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_89zudSzYEeeKOdJYr-htag" type="Class_NestedClassifierCompartment">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LZoMFa80EeemetdP4I8Ciw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LZoMFq80EeemetdP4I8Ciw" key="visible" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_89zudizYEeeKOdJYr-htag"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_89zudyzYEeeKOdJYr-htag"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_89zueCzYEeeKOdJYr-htag"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_89zueSzYEeeKOdJYr-htag"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_899fcCzYEeeKOdJYr-htag" visible="false" type="compartment_shape_display">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_899fcSzYEeeKOdJYr-htag"/>
+ <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"/>
+ </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"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_TpPHMK8zEeemetdP4I8Ciw" type="Class_Shape">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LZebAK80EeemetdP4I8Ciw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LZoMAK80EeemetdP4I8Ciw" key="visible" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_TpYRIK8zEeemetdP4I8Ciw" type="Class_NameLabel">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LZoMAa80EeemetdP4I8Ciw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LZoMAq80EeemetdP4I8Ciw" key="visible" value="true"/>
+ </eAnnotations>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_TpY4MK8zEeemetdP4I8Ciw" type="Class_FloatingNameLabel">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LZoMA680EeemetdP4I8Ciw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LZoMBK80EeemetdP4I8Ciw" key="visible" value="true"/>
+ </eAnnotations>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_TpY4Ma8zEeemetdP4I8Ciw" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_TpZfQK8zEeemetdP4I8Ciw" type="Class_AttributeCompartment">
+ <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>
+ <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>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_TpZfQa8zEeemetdP4I8Ciw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_TpZfQq8zEeemetdP4I8Ciw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_TpZfQ68zEeemetdP4I8Ciw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TpZfRK8zEeemetdP4I8Ciw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_TpaGUK8zEeemetdP4I8Ciw" type="Class_OperationCompartment">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LZoMB680EeemetdP4I8Ciw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LZoMCK80EeemetdP4I8Ciw" key="visible" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_TpaGUa8zEeemetdP4I8Ciw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_TpaGUq8zEeemetdP4I8Ciw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_TpaGU68zEeemetdP4I8Ciw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TpaGVK8zEeemetdP4I8Ciw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_TpaGVa8zEeemetdP4I8Ciw" type="Class_NestedClassifierCompartment">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LZoMCa80EeemetdP4I8Ciw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LZoMCq80EeemetdP4I8Ciw" key="visible" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_TpaGVq8zEeemetdP4I8Ciw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_TpaGV68zEeemetdP4I8Ciw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_TpaGWK8zEeemetdP4I8Ciw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TpaGWa8zEeemetdP4I8Ciw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_TpqlAK8zEeemetdP4I8Ciw" visible="false" type="compartment_shape_display">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_TpqlAa8zEeemetdP4I8Ciw"/>
+ <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"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_f37RoK8zEeemetdP4I8Ciw" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_f374sK8zEeemetdP4I8Ciw" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_f374sa8zEeemetdP4I8Ciw" type="Class_FloatingNameLabel">
+ <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>
+ <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>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_f38fwa8zEeemetdP4I8Ciw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_f38fwq8zEeemetdP4I8Ciw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_f38fw68zEeemetdP4I8Ciw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f38fxK8zEeemetdP4I8Ciw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_f38fxa8zEeemetdP4I8Ciw" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_f38fxq8zEeemetdP4I8Ciw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_f38fx68zEeemetdP4I8Ciw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_f38fyK8zEeemetdP4I8Ciw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f38fya8zEeemetdP4I8Ciw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_f38fyq8zEeemetdP4I8Ciw" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_f38fy68zEeemetdP4I8Ciw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_f38fzK8zEeemetdP4I8Ciw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_f38fza8zEeemetdP4I8Ciw"/>
+ <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"/>
+ </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"/>
+ </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"/>
+ </children>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_IsaTkSTWEeehXLEpOVl1Ig" name="diagram_compatibility_version" stringValue="1.3.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)"/>
+ </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">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_kq0Y4K8zEeemetdP4I8Ciw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_sDGIcSslEeeV_fNySaALnw" y="60"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_sDGvgCslEeeV_fNySaALnw" type="InterfaceRealization_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_krcrAK8zEeemetdP4I8Ciw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_sDGvgSslEeeV_fNySaALnw" y="30"/>
+ </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)"/>
+ <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)"/>
+ </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)"/>
+ </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)"/>
+ </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)"/>
+ </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)"/>
+ </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>
+ <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>
+ </notation:Diagram>
+ <css:ModelStyleSheets xmi:id="_-J2o4CTXEeehXLEpOVl1Ig">
+ <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_CmRJ0CTYEeehXLEpOVl1Ig" path="/org.eclipse.papyrus.infra.emf.expressions/model/custom.css"/>
+ </css:ModelStyleSheets>
+</xmi:XMI>
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 e6b28975428..7e7733d7366 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
@@ -1,90 +1,132 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
- <uml:Model xmi:id="_IqN7MCTWEeehXLEpOVl1Ig" name="UMLExpressions" URI="http://www.eclipse.org/papyrus/umlexpressions">
- <ownedComment xmi:type="uml:Comment" xmi:id="_yNBqgCTXEeehXLEpOVl1Ig" annotatedElement="_7sVTACTWEeehXLEpOVl1Ig">
- <body>This expression to use to ckech if a UML object is stereotyped with the expected stereotype.&#xD;
-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.&#xD;
-URI profile field is not mandatory for the test.</body>
- </ownedComment>
- <ownedComment xmi:type="uml:Comment" xmi:id="_wCQFoCslEeeV_fNySaALnw" annotatedElement="_okQDACslEeeV_fNySaALnw">
- <body>This expressions tests is stereotypes are applied on the object.&#xD;
-The evaluate method returns TRUE if at least one Stereotype is applied on the object.&#xD;
-The evaluate method returns FALSE if no Stereotype is applied on the object.&#xD;
-The evaluate method returns FALSE when the argument is NULL.&#xD;
-The evaluate method returns FALSE when the argument is not an instance of UML::Element</body>
- </ownedComment>
- <ownedComment xmi:type="uml:Comment" xmi:id="_1o9dQCzXEeeKOdJYr-htag" annotatedElement="_dbFkACzXEeeKOdJYr-htag">
- <body>&lt;p>The evaluate methods returns True if the argument&amp;nbsp;has the&amp;nbsp;same type thant the excepted metaclass.&lt;/p>
-
-&lt;p>If the metaclass is not defined, the evaluate method returns False.&lt;/p>
-</body>
- </ownedComment>
- <ownedComment xmi:type="uml:Comment" xmi:id="_-wdX0CzYEeeKOdJYr-htag" annotatedElement="_89wEECzYEeeKOdJYr-htag">
- <body>&lt;p>The evaluate methods returns True if the arguments is an instance of the expected metaclass.&lt;/p>
-
-&lt;p>If the metaclass is not defined, the evaluate method returns False.&lt;/p>
-</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.&#xD;
-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>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_okQDACslEeeV_fNySaALnw" name="HasAppliedStereotypesExpression">
- <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_sBu2gCslEeeV_fNySaALnw" client="_okQDACslEeeV_fNySaALnw">
- <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="_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>
- </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>
- </packagedElement>
- <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_roK2YCTXEeehXLEpOVl1Ig">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_roMrkCTXEeehXLEpOVl1Ig" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
- </eAnnotations>
- <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
- </profileApplication>
- </uml:Model>
- <Ecore:EPackage xmi:id="_AMYE0CTZEeehXLEpOVl1Ig" base_Package="_IqN7MCTWEeehXLEpOVl1Ig" packageName="umlexpressions" nsPrefix="umlexpressions" basePackage="org.eclipse.papyrus.uml.expressions" prefix="UMLExpressions"/>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
+ <uml:Model xmi:id="_IqN7MCTWEeehXLEpOVl1Ig" name="UMLExpressions" URI="http://www.eclipse.org/papyrus/umlexpressions">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_yNBqgCTXEeehXLEpOVl1Ig" annotatedElement="_7sVTACTWEeehXLEpOVl1Ig">
+ <body>This expression to use to ckech if a UML object is stereotyped with the expected stereotype.&#xD;
+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.&#xD;
+URI profile field is not mandatory for the test.</body>
+ </ownedComment>
+ <ownedComment xmi:type="uml:Comment" xmi:id="_wCQFoCslEeeV_fNySaALnw" annotatedElement="_okQDACslEeeV_fNySaALnw">
+ <body>This expressions tests is stereotypes are applied on the object.&#xD;
+The evaluate method returns TRUE if at least one Stereotype is applied on the object.&#xD;
+The evaluate method returns FALSE if no Stereotype is applied on the object.&#xD;
+The evaluate method returns FALSE when the argument is NULL.&#xD;
+The evaluate method returns FALSE when the argument is not an instance of UML::Element</body>
+ </ownedComment>
+ <ownedComment xmi:type="uml:Comment" xmi:id="_1o9dQCzXEeeKOdJYr-htag" annotatedElement="_dbFkACzXEeeKOdJYr-htag">
+ <body>&lt;p>The evaluate methods returns True if the argument&amp;nbsp;has the&amp;nbsp;same type thant the excepted metaclass.&lt;/p>
+
+&lt;p>If the metaclass is not defined, the evaluate method returns False.&lt;/p>
+</body>
+ </ownedComment>
+ <ownedComment xmi:type="uml:Comment" xmi:id="_-wdX0CzYEeeKOdJYr-htag" annotatedElement="_89wEECzYEeeKOdJYr-htag">
+ <body>&lt;p>The evaluate methods returns True if the arguments is an instance of the expected metaclass.&lt;/p>
+
+&lt;p>If the metaclass is not defined, the evaluate method returns False.&lt;/p>
+</body>
+ </ownedComment>
+ <ownedComment xmi:type="uml:Comment" xmi:id="_138WwK80EeemetdP4I8Ciw" annotatedElement="_f3yHsK8zEeemetdP4I8Ciw">
+ <body>This expression is used to ckech if a UML object is stereotyped with the expected stereotype.&#xD;
+The evaluate method returns TRUE when the object is stereotyped by the stereotype identified by its qualified name&#xD;
+</body>
+ </ownedComment>
+ <ownedComment xmi:type="uml:Comment" xmi:id="_VcHvMK81EeemetdP4I8Ciw" annotatedElement="_To5I8K8zEeemetdP4I8Ciw">
+ <body>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.&#xD;
+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&#xD;
+</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.&#xD;
+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>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_okQDACslEeeV_fNySaALnw" name="HasAppliedStereotypesExpression">
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_sBu2gCslEeeV_fNySaALnw" client="_okQDACslEeeV_fNySaALnw">
+ <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="_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>
+ </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>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_To5I8K8zEeemetdP4I8Ciw" name="IsTypeOfStereotypeExpression">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_ucH64K8zEeemetdP4I8Ciw" name="stereotypeQualifiedName">
+ <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"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_ETqgAK9iEeexsdIvvO0f9g" name="profileURI">
+ <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"/>
+ </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">
+ <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"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_KAjxYK9iEeexsdIvvO0f9g" name="profileURI">
+ <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"/>
+ </ownedAttribute>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_RvOcUK9ZEeexsdIvvO0f9g" client="_f3yHsK8zEeemetdP4I8Ciw">
+ <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>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_roK2YCTXEeehXLEpOVl1Ig">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_roMrkCTXEeehXLEpOVl1Ig" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+ </profileApplication>
+ </uml:Model>
+ <Ecore:EPackage xmi:id="_AMYE0CTZEeehXLEpOVl1Ig" base_Package="_IqN7MCTWEeehXLEpOVl1Ig" packageName="umlexpressions" nsPrefix="umlexpressions" basePackage="org.eclipse.papyrus.uml.expressions" prefix="UMLExpressions"/>
+</xmi:XMI>
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 3072b7347ae..db325f077ca 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>1.0.0-SNAPSHOT</version>
+ <version>2.0.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/IsKindOfStereotypeExpression.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsKindOfStereotypeExpression.java
new file mode 100644
index 00000000000..acd11fdf388
--- /dev/null
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsKindOfStereotypeExpression.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 v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * 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>Is Kind Of Stereotype Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * 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
+ *
+ * <!-- 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);
+
+} // IsKindOfStereotypeExpression
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
new file mode 100644
index 00000000000..28cd5305f88
--- /dev/null
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/IsTypeOfStereotypeExpression.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 v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * 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>Is Type Of Stereotype Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * 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
+ *
+ * <!-- 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);
+
+} // IsTypeOfStereotypeExpression
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 a749e6a76ed..d611bfc4af7 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
@@ -68,6 +68,24 @@ public interface UMLExpressionsFactory extends EFactory {
IsKindOfExpression createIsKindOfExpression();
/**
+ * Returns a new object of class '<em>Is Kind Of Stereotype Expression</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Is Kind Of Stereotype Expression</em>'.
+ * @generated
+ */
+ IsKindOfStereotypeExpression createIsKindOfStereotypeExpression();
+
+ /**
+ * Returns a new object of class '<em>Is Type Of Stereotype Expression</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Is Type Of Stereotype Expression</em>'.
+ * @generated
+ */
+ IsTypeOfStereotypeExpression createIsTypeOfStereotypeExpression();
+
+ /**
* 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 cdfb40e51cd..a9b05288a6a 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
@@ -327,6 +327,152 @@ public interface UMLExpressionsPackage extends EPackage {
int IS_KIND_OF_EXPRESSION_OPERATION_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_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.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfStereotypeExpressionImpl
+ * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getIsKindOfStereotypeExpression()
+ * @generated
+ */
+ int IS_KIND_OF_STEREOTYPE_EXPRESSION = 4;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int IS_KIND_OF_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 IS_KIND_OF_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 IS_KIND_OF_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 IS_KIND_OF_STEREOTYPE_EXPRESSION__PROFILE_URI = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1;
+
+ /**
+ * The number of structural features of the '<em>Is Kind Of Stereotype Expression</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int IS_KIND_OF_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 IS_KIND_OF_STEREOTYPE_EXPRESSION___EVALUATE__OBJECT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT;
+
+ /**
+ * The number of operations of the '<em>Is Kind Of Stereotype Expression</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int IS_KIND_OF_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.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
+ */
+ int IS_TYPE_OF_STEREOTYPE_EXPRESSION = 5;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int IS_TYPE_OF_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 IS_TYPE_OF_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 IS_TYPE_OF_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 IS_TYPE_OF_STEREOTYPE_EXPRESSION__PROFILE_URI = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_FEATURE_COUNT + 1;
+
+ /**
+ * The number of structural features of the '<em>Is Type Of Stereotype Expression</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int IS_TYPE_OF_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 IS_TYPE_OF_STEREOTYPE_EXPRESSION___EVALUATE__OBJECT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION___EVALUATE__OBJECT;
+
+ /**
+ * The number of operations of the '<em>Is Type Of Stereotype Expression</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int IS_TYPE_OF_STEREOTYPE_EXPRESSION_OPERATION_COUNT = BooleanExpressionsPackage.IBOOLEAN_EOBJECT_EXPRESSION_OPERATION_COUNT + 0;
+
+ /**
* Returns the meta object for class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsStereotypedWithExpression <em>Is Stereotyped With Expression</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -411,6 +557,70 @@ public interface UMLExpressionsPackage extends EPackage {
EReference getIsKindOfExpression_UmlEClass();
/**
+ * Returns the meta object for class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression <em>Is Kind Of Stereotype Expression</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Is Kind Of Stereotype Expression</em>'.
+ * @see org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression
+ * @generated
+ */
+ 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>}'.
+ * <!-- 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()
+ * @generated
+ */
+ EAttribute getIsKindOfStereotypeExpression_ProfileURI();
+
+ /**
+ * 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 class '<em>Is Type Of Stereotype Expression</em>'.
+ * @see org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression
+ * @generated
+ */
+ EClass getIsTypeOfStereotypeExpression();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression#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.IsTypeOfStereotypeExpression#getStereotypeQualifiedName()
+ * @see #getIsTypeOfStereotypeExpression()
+ * @generated
+ */
+ EAttribute getIsTypeOfStereotypeExpression_StereotypeQualifiedName();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression#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.IsTypeOfStereotypeExpression#getProfileURI()
+ * @see #getIsTypeOfStereotypeExpression()
+ * @generated
+ */
+ EAttribute getIsTypeOfStereotypeExpression_ProfileURI();
+
+ /**
* Returns the factory that creates the instances of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -505,6 +715,58 @@ public interface UMLExpressionsPackage extends EPackage {
*/
EReference IS_KIND_OF_EXPRESSION__UML_ECLASS = eINSTANCE.getIsKindOfExpression_UmlEClass();
+ /**
+ * The meta object literal for the '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfStereotypeExpressionImpl <em>Is Kind Of Stereotype Expression</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfStereotypeExpressionImpl
+ * @see org.eclipse.papyrus.uml.expressions.umlexpressions.impl.UMLExpressionsPackageImpl#getIsKindOfStereotypeExpression()
+ * @generated
+ */
+ 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.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute IS_KIND_OF_STEREOTYPE_EXPRESSION__PROFILE_URI = eINSTANCE.getIsKindOfStereotypeExpression_ProfileURI();
+
+ /**
+ * 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
+ */
+ EClass IS_TYPE_OF_STEREOTYPE_EXPRESSION = eINSTANCE.getIsTypeOfStereotypeExpression();
+
+ /**
+ * The meta object literal for the '<em><b>Stereotype Qualified Name</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute IS_TYPE_OF_STEREOTYPE_EXPRESSION__STEREOTYPE_QUALIFIED_NAME = eINSTANCE.getIsTypeOfStereotypeExpression_StereotypeQualifiedName();
+
+ /**
+ * The meta object literal for the '<em><b>Profile URI</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute IS_TYPE_OF_STEREOTYPE_EXPRESSION__PROFILE_URI = eINSTANCE.getIsTypeOfStereotypeExpression_ProfileURI();
+
}
} //UMLExpressionsPackage
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
new file mode 100644
index 00000000000..b7016327cf6
--- /dev/null
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsKindOfStereotypeExpressionImpl.java
@@ -0,0 +1,361 @@
+/**
+ * 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 v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * 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;
+
+/**
+ * <!-- 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;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IsKindOfStereotypeExpressionImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return UMLExpressionsPackage.Literals.IS_KIND_OF_STEREOTYPE_EXPRESSION;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ 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
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ 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
+ */
+ public String getStereotypeQualifiedName() {
+ return stereotypeQualifiedName;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ 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
+ */
+ public String getProfileURI() {
+ return profileURI;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ 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();
+
+ StringBuffer result = new StringBuffer(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/IsTypeOfStereotypeExpressionImpl.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsTypeOfStereotypeExpressionImpl.java
new file mode 100644
index 00000000000..f22391354c3
--- /dev/null
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/IsTypeOfStereotypeExpressionImpl.java
@@ -0,0 +1,361 @@
+/**
+ * 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 v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * 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;
+
+/**
+ * <!-- 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;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IsTypeOfStereotypeExpressionImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return UMLExpressionsPackage.Literals.IS_TYPE_OF_STEREOTYPE_EXPRESSION;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ 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
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ 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
+ */
+ public String getStereotypeQualifiedName() {
+ return stereotypeQualifiedName;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ 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
+ */
+ public String getProfileURI() {
+ return profileURI;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ 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();
+
+ StringBuffer result = new StringBuffer(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/UMLExpressionsFactoryImpl.java b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src-gen/org/eclipse/papyrus/uml/expressions/umlexpressions/impl/UMLExpressionsFactoryImpl.java
index 807085fc2d1..43baca2773d 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
@@ -70,6 +70,8 @@ public class UMLExpressionsFactoryImpl extends EFactoryImpl implements UMLExpres
case UMLExpressionsPackage.HAS_APPLIED_STEREOTYPES_EXPRESSION: return createHasAppliedStereotypesExpression();
case UMLExpressionsPackage.IS_TYPE_OF_EXPRESSION: return createIsTypeOfExpression();
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();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -120,6 +122,26 @@ public class UMLExpressionsFactoryImpl extends EFactoryImpl implements UMLExpres
* <!-- end-user-doc -->
* @generated
*/
+ public IsKindOfStereotypeExpression createIsKindOfStereotypeExpression() {
+ IsKindOfStereotypeExpressionImpl isKindOfStereotypeExpression = new IsKindOfStereotypeExpressionImpl();
+ return isKindOfStereotypeExpression;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public IsTypeOfStereotypeExpression createIsTypeOfStereotypeExpression() {
+ IsTypeOfStereotypeExpressionImpl isTypeOfStereotypeExpression = new IsTypeOfStereotypeExpressionImpl();
+ return isTypeOfStereotypeExpression;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
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 875ac793dde..4c40c4877a1 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
@@ -22,8 +22,10 @@ import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
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.UMLExpressionsFactory;
import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsPackage;
@@ -63,6 +65,20 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres
private EClass isKindOfExpressionEClass = null;
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass isKindOfStereotypeExpressionEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass isTypeOfStereotypeExpressionEClass = 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.
@@ -204,6 +220,60 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres
* <!-- end-user-doc -->
* @generated
*/
+ public EClass getIsKindOfStereotypeExpression() {
+ return isKindOfStereotypeExpressionEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getIsKindOfStereotypeExpression_StereotypeQualifiedName() {
+ return (EAttribute)isKindOfStereotypeExpressionEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getIsKindOfStereotypeExpression_ProfileURI() {
+ return (EAttribute)isKindOfStereotypeExpressionEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getIsTypeOfStereotypeExpression() {
+ return isTypeOfStereotypeExpressionEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getIsTypeOfStereotypeExpression_StereotypeQualifiedName() {
+ return (EAttribute)isTypeOfStereotypeExpressionEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getIsTypeOfStereotypeExpression_ProfileURI() {
+ return (EAttribute)isTypeOfStereotypeExpressionEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public UMLExpressionsFactory getUMLExpressionsFactory() {
return (UMLExpressionsFactory)getEFactoryInstance();
}
@@ -238,6 +308,14 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres
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);
}
/**
@@ -276,6 +354,8 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres
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());
// Initialize classes, features, and operations; add parameters
initEClass(isStereotypedWithExpressionEClass, IsStereotypedWithExpression.class, "IsStereotypedWithExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
@@ -290,6 +370,14 @@ public class UMLExpressionsPackageImpl extends EPackageImpl implements UMLExpres
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$
+
// 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 7debefe1c26..5f8b3031497 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
@@ -97,6 +97,14 @@ public class UMLExpressionsAdapterFactory extends AdapterFactoryImpl {
return createIsKindOfExpressionAdapter();
}
@Override
+ public Adapter caseIsKindOfStereotypeExpression(IsKindOfStereotypeExpression object) {
+ return createIsKindOfStereotypeExpressionAdapter();
+ }
+ @Override
+ public Adapter caseIsTypeOfStereotypeExpression(IsTypeOfStereotypeExpression object) {
+ return createIsTypeOfStereotypeExpressionAdapter();
+ }
+ @Override
public Adapter caseIBasicExpressionElement(IBasicExpressionElement object) {
return createIBasicExpressionElementAdapter();
}
@@ -189,6 +197,34 @@ public class UMLExpressionsAdapterFactory extends AdapterFactoryImpl {
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression <em>Is Kind Of 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.IsKindOfStereotypeExpression
+ * @generated
+ */
+ public Adapter createIsKindOfStereotypeExpressionAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression <em>Is Type Of 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.IsTypeOfStereotypeExpression
+ * @generated
+ */
+ public Adapter createIsTypeOfStereotypeExpressionAdapter() {
+ 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 d782e103a46..09e23630c9c 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
@@ -119,6 +119,26 @@ public class UMLExpressionsSwitch<T> extends Switch<T> {
if (result == null) result = defaultCase(theEObject);
return result;
}
+ case UMLExpressionsPackage.IS_KIND_OF_STEREOTYPE_EXPRESSION: {
+ IsKindOfStereotypeExpression isKindOfStereotypeExpression = (IsKindOfStereotypeExpression)theEObject;
+ T result = caseIsKindOfStereotypeExpression(isKindOfStereotypeExpression);
+ if (result == null) result = caseIBooleanEObjectExpression(isKindOfStereotypeExpression);
+ if (result == null) result = caseIBooleanExpression(isKindOfStereotypeExpression);
+ if (result == null) result = caseIExpression(isKindOfStereotypeExpression);
+ if (result == null) result = caseIBasicExpressionElement(isKindOfStereotypeExpression);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case UMLExpressionsPackage.IS_TYPE_OF_STEREOTYPE_EXPRESSION: {
+ IsTypeOfStereotypeExpression isTypeOfStereotypeExpression = (IsTypeOfStereotypeExpression)theEObject;
+ T result = caseIsTypeOfStereotypeExpression(isTypeOfStereotypeExpression);
+ if (result == null) result = caseIBooleanEObjectExpression(isTypeOfStereotypeExpression);
+ if (result == null) result = caseIBooleanExpression(isTypeOfStereotypeExpression);
+ if (result == null) result = caseIExpression(isTypeOfStereotypeExpression);
+ if (result == null) result = caseIBasicExpressionElement(isTypeOfStereotypeExpression);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
default: return defaultCase(theEObject);
}
}
@@ -184,6 +204,36 @@ public class UMLExpressionsSwitch<T> extends Switch<T> {
}
/**
+ * Returns the result of interpreting the object as an instance of '<em>Is Kind Of 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>Is Kind Of Stereotype Expression</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseIsKindOfStereotypeExpression(IsKindOfStereotypeExpression object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Is Type Of 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>Is Type Of Stereotype Expression</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseIsTypeOfStereotypeExpression(IsTypeOfStereotypeExpression 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
new file mode 100644
index 00000000000..c7dba948024
--- /dev/null
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomIsKindOfStereotypeExpression.java
@@ -0,0 +1,82 @@
+/*****************************************************************************
+ * 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 v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.expressions.umlexpressions.custom;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsKindOfStereotypeExpressionImpl;
+import org.eclipse.papyrus.uml.expressions.umlexpressions.utils.UMLExpressionsUtils;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Stereotype;
+
+/**
+ * @author as247872
+ *
+ */
+public class CustomIsKindOfStereotypeExpression extends IsKindOfStereotypeExpressionImpl {
+
+ /**
+ * @see org.eclipse.papyrus.infra.emf.expressions.IExpression#evaluate(java.lang.Object)
+ *
+ * @param context
+ * @return
+ */
+ @Override
+ public Boolean evaluate(EObject context) {
+ boolean result = false;
+ 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() && !result) {
+ // 1. first case : the current stereotype is the expected one
+ 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
+ result = profileURI.equals(UMLExpressionsUtils.getTopProfileURI(current));
+ } else {
+ result = true;
+ }
+ }
+
+ // 2. second case : the current stereotype is a subtype of the expected one
+ if (!result) {
+ // we get the list of the stereotypes parent
+ final List<Stereotype> parents = current.allParents()
+ .stream()
+ .filter(Stereotype.class::isInstance).map(Stereotype.class::cast)
+ .filter(s -> s.getQualifiedName().equals(this.stereotypeQualifiedName))
+ .collect(Collectors.toList());
+
+ if (parents.size() > 0) {
+ if (null != this.profileURI && !this.profileURI.isEmpty()) {
+ Iterator<Stereotype> iterParents = parents.iterator();
+ while (!result && iterParents.hasNext()) {
+ result = profileURI.equals(UMLExpressionsUtils.getTopProfileURI(iterParents.next()));
+ }
+ } else {
+ result = true;
+ }
+ }
+ }
+ }
+ }
+ return Boolean.valueOf(result);
+
+ }
+
+}
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
new file mode 100644
index 00000000000..6aa1e61a077
--- /dev/null
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/src/org/eclipse/papyrus/uml/expressions/umlexpressions/custom/CustomIsTypeOfStereotypeExpression.java
@@ -0,0 +1,59 @@
+/*****************************************************************************
+ * 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 v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.expressions.umlexpressions.custom;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.uml.expressions.umlexpressions.impl.IsTypeOfStereotypeExpressionImpl;
+import org.eclipse.papyrus.uml.expressions.umlexpressions.utils.UMLExpressionsUtils;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Stereotype;
+
+/**
+ * @author as247872
+ *
+ */
+public class CustomIsTypeOfStereotypeExpression extends IsTypeOfStereotypeExpressionImpl {
+
+ /**
+ * @see org.eclipse.papyrus.infra.emf.expressions.IExpression#evaluate(java.lang.Object)
+ *
+ * @param context
+ * @return
+ */
+ @Override
+ public Boolean evaluate(EObject context) {
+
+ boolean result = false;
+ 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() && !result) {
+ 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
+ result = profileURI.equals(UMLExpressionsUtils.getTopProfileURI(current));
+ } else {
+ result = true;
+ }
+ }
+ }
+ }
+ return Boolean.valueOf(result);
+ }
+
+
+}
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 406f80ff2f6..f02da211de5 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
@@ -14,8 +14,10 @@ package org.eclipse.papyrus.uml.expressions.umlexpressions.custom;
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.impl.UMLExpressionsFactoryImpl;
/**
@@ -66,4 +68,28 @@ 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();
+ }
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF
index 3e16860f0cc..29931cf27a0 100755
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[5.0.0,6.0.0]
org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.expressions;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.expressions;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.emf.expressions.properties;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)"
Bundle-Activator: org.eclipse.papyrus.uml.nattable.properties.Activator
diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/META-INF/MANIFEST.MF
index c3ca066c89b..bc3838dea68 100755
--- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.uml.expressions;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.expressions;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.editor.integration.tests;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.notation b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.notation
index c939569f559..62958366c24 100755
--- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.notation
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.notation
@@ -1,127 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_S-8MECgzEeeoAJG6t_MwCA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_UsONQCgzEeeoAJG6t_MwCA" type="Class_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_UsO0UCgzEeeoAJG6t_MwCA" type="Class_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_UsO0USgzEeeoAJG6t_MwCA" type="Class_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UsO0UigzEeeoAJG6t_MwCA" y="15"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_UsO0UygzEeeoAJG6t_MwCA" type="Class_AttributeCompartment">
- <children xmi:type="notation:Shape" xmi:id="_V3wMQCgzEeeoAJG6t_MwCA" type="Property_ClassAttributeLabel">
- <element xmi:type="uml:Property" href="expressionModelTest.uml#_V3npYCgzEeeoAJG6t_MwCA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_V3wMQSgzEeeoAJG6t_MwCA"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_UsO0VCgzEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_UsO0VSgzEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_UsO0VigzEeeoAJG6t_MwCA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsO0VygzEeeoAJG6t_MwCA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_UsPbYCgzEeeoAJG6t_MwCA" type="Class_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_UsPbYSgzEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_UsPbYigzEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_UsPbYygzEeeoAJG6t_MwCA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsPbZCgzEeeoAJG6t_MwCA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_UsPbZSgzEeeoAJG6t_MwCA" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_UsPbZigzEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_UsPbZygzEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_UsPbaCgzEeeoAJG6t_MwCA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsPbaSgzEeeoAJG6t_MwCA"/>
- </children>
- <element xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsONQSgzEeeoAJG6t_MwCA" x="120" y="60" width="201" height="141"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_daXpICgzEeeoAJG6t_MwCA" type="Class_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_daYQMCgzEeeoAJG6t_MwCA" type="Class_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_daYQMSgzEeeoAJG6t_MwCA" type="Class_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_daYQMigzEeeoAJG6t_MwCA" y="15"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_daYQMygzEeeoAJG6t_MwCA" type="Class_AttributeCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_daYQNCgzEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_daYQNSgzEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_daYQNigzEeeoAJG6t_MwCA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daYQNygzEeeoAJG6t_MwCA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_daYQOCgzEeeoAJG6t_MwCA" type="Class_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_daYQOSgzEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_daYQOigzEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_daY3QCgzEeeoAJG6t_MwCA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daY3QSgzEeeoAJG6t_MwCA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_daY3QigzEeeoAJG6t_MwCA" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_daY3QygzEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_daY3RCgzEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_daY3RSgzEeeoAJG6t_MwCA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daY3RigzEeeoAJG6t_MwCA"/>
- </children>
- <element xmi:type="uml:Class" href="expressionModelTest.uml#_daTXsCgzEeeoAJG6t_MwCA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daXpISgzEeeoAJG6t_MwCA" x="120" y="240" width="201" height="101"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_TLBLIC0TEee42cCIRX36lw" type="Class_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_TLDAUC0TEee42cCIRX36lw" type="Class_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_TLDAUS0TEee42cCIRX36lw" type="Class_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_TLDAUi0TEee42cCIRX36lw" y="15"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOcC0TEee42cCIRX36lw" type="Class_AttributeCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_TLEOcS0TEee42cCIRX36lw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOci0TEee42cCIRX36lw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOcy0TEee42cCIRX36lw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLEOdC0TEee42cCIRX36lw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOdS0TEee42cCIRX36lw" type="Class_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_TLEOdi0TEee42cCIRX36lw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOdy0TEee42cCIRX36lw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOeC0TEee42cCIRX36lw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLEOeS0TEee42cCIRX36lw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOei0TEee42cCIRX36lw" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_TLEOey0TEee42cCIRX36lw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOfC0TEee42cCIRX36lw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOfS0TEee42cCIRX36lw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLEOfi0TEee42cCIRX36lw"/>
- </children>
- <element xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLBLIS0TEee42cCIRX36lw" x="480" y="60" width="201" height="141"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_3ooXsC0TEee42cCIRX36lw" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_3ooXsS0TEee42cCIRX36lw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3ooXsy0TEee42cCIRX36lw" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>
- </styles>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3ooXsi0TEee42cCIRX36lw" x="680" y="60"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_A6ngdC0UEee42cCIRX36lw" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_A6ngdS0UEee42cCIRX36lw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A6ngdy0UEee42cCIRX36lw" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>
- </styles>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A6ngdi0UEee42cCIRX36lw" x="320" y="60"/>
- </children>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_S-8MESgzEeeoAJG6t_MwCA" name="diagram_compatibility_version" stringValue="1.3.0"/>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_S-8MEigzEeeoAJG6t_MwCA"/>
- <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_S-8MEygzEeeoAJG6t_MwCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
- <owner xmi:type="uml:Model" href="expressionModelTest.uml#_8TUvwCgyEeeoAJG6t_MwCA"/>
- </styles>
- <element xmi:type="uml:Model" href="expressionModelTest.uml#_8TUvwCgyEeeoAJG6t_MwCA"/>
- <edges xmi:type="notation:Connector" xmi:id="_3ooXtC0TEee42cCIRX36lw" type="StereotypeCommentLink" source="_TLBLIC0TEee42cCIRX36lw" target="_3ooXsC0TEee42cCIRX36lw">
- <styles xmi:type="notation:FontStyle" xmi:id="_3ooXtS0TEee42cCIRX36lw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3ooXuS0TEee42cCIRX36lw" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3ooXti0TEee42cCIRX36lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ooXty0TEee42cCIRX36lw"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ooXuC0TEee42cCIRX36lw"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_A6oHgC0UEee42cCIRX36lw" type="StereotypeCommentLink" source="_UsONQCgzEeeoAJG6t_MwCA" target="_A6ngdC0UEee42cCIRX36lw">
- <styles xmi:type="notation:FontStyle" xmi:id="_A6oHgS0UEee42cCIRX36lw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A6oHhS0UEee42cCIRX36lw" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_A6oHgi0UEee42cCIRX36lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6oHgy0UEee42cCIRX36lw"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6oHhC0UEee42cCIRX36lw"/>
- </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_S-8MECgzEeeoAJG6t_MwCA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_UsONQCgzEeeoAJG6t_MwCA" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_UsO0UCgzEeeoAJG6t_MwCA" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_UsO0USgzEeeoAJG6t_MwCA" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_UsO0UigzEeeoAJG6t_MwCA" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_UsO0UygzEeeoAJG6t_MwCA" type="Class_AttributeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_V3wMQCgzEeeoAJG6t_MwCA" type="Property_ClassAttributeLabel">
+ <element xmi:type="uml:Property" href="expressionModelTest.uml#_V3npYCgzEeeoAJG6t_MwCA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_V3wMQSgzEeeoAJG6t_MwCA"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_UsO0VCgzEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_UsO0VSgzEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_UsO0VigzEeeoAJG6t_MwCA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsO0VygzEeeoAJG6t_MwCA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_UsPbYCgzEeeoAJG6t_MwCA" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_UsPbYSgzEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_UsPbYigzEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_UsPbYygzEeeoAJG6t_MwCA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsPbZCgzEeeoAJG6t_MwCA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_UsPbZSgzEeeoAJG6t_MwCA" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_UsPbZigzEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_UsPbZygzEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_UsPbaCgzEeeoAJG6t_MwCA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsPbaSgzEeeoAJG6t_MwCA"/>
+ </children>
+ <element xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsONQSgzEeeoAJG6t_MwCA" x="120" y="60" width="201" height="141"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_daXpICgzEeeoAJG6t_MwCA" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_daYQMCgzEeeoAJG6t_MwCA" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_daYQMSgzEeeoAJG6t_MwCA" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_daYQMigzEeeoAJG6t_MwCA" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_daYQMygzEeeoAJG6t_MwCA" type="Class_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_daYQNCgzEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_daYQNSgzEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_daYQNigzEeeoAJG6t_MwCA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daYQNygzEeeoAJG6t_MwCA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_daYQOCgzEeeoAJG6t_MwCA" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_daYQOSgzEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_daYQOigzEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_daY3QCgzEeeoAJG6t_MwCA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daY3QSgzEeeoAJG6t_MwCA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_daY3QigzEeeoAJG6t_MwCA" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_daY3QygzEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_daY3RCgzEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_daY3RSgzEeeoAJG6t_MwCA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daY3RigzEeeoAJG6t_MwCA"/>
+ </children>
+ <element xmi:type="uml:Class" href="expressionModelTest.uml#_daTXsCgzEeeoAJG6t_MwCA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daXpISgzEeeoAJG6t_MwCA" x="120" y="240" width="201" height="101"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_TLBLIC0TEee42cCIRX36lw" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_TLDAUC0TEee42cCIRX36lw" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_TLDAUS0TEee42cCIRX36lw" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_TLDAUi0TEee42cCIRX36lw" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOcC0TEee42cCIRX36lw" type="Class_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_TLEOcS0TEee42cCIRX36lw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOci0TEee42cCIRX36lw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOcy0TEee42cCIRX36lw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLEOdC0TEee42cCIRX36lw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOdS0TEee42cCIRX36lw" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_TLEOdi0TEee42cCIRX36lw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOdy0TEee42cCIRX36lw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOeC0TEee42cCIRX36lw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLEOeS0TEee42cCIRX36lw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOei0TEee42cCIRX36lw" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_TLEOey0TEee42cCIRX36lw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOfC0TEee42cCIRX36lw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOfS0TEee42cCIRX36lw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLEOfi0TEee42cCIRX36lw"/>
+ </children>
+ <element xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLBLIS0TEee42cCIRX36lw" x="480" y="60" width="201" height="141"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3ooXsC0TEee42cCIRX36lw" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_3ooXsS0TEee42cCIRX36lw"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3ooXsy0TEee42cCIRX36lw" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3ooXsi0TEee42cCIRX36lw" x="680" y="60"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_A6ngdC0UEee42cCIRX36lw" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_A6ngdS0UEee42cCIRX36lw"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A6ngdy0UEee42cCIRX36lw" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A6ngdi0UEee42cCIRX36lw" x="320" y="60"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_vI_ZULAiEee43bo6S9i5Mw" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_vJAAYLAiEee43bo6S9i5Mw" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_vJAAYbAiEee43bo6S9i5Mw" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_vJAncLAiEee43bo6S9i5Mw" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_vJAncbAiEee43bo6S9i5Mw" type="Class_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_vJAncrAiEee43bo6S9i5Mw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_vJAnc7AiEee43bo6S9i5Mw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_vJAndLAiEee43bo6S9i5Mw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vJAndbAiEee43bo6S9i5Mw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_vJAndrAiEee43bo6S9i5Mw" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_vJAnd7AiEee43bo6S9i5Mw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_vJAneLAiEee43bo6S9i5Mw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_vJAnebAiEee43bo6S9i5Mw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vJAnerAiEee43bo6S9i5Mw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_vJBOgLAiEee43bo6S9i5Mw" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_vJBOgbAiEee43bo6S9i5Mw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_vJBOgrAiEee43bo6S9i5Mw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_vJBOg7AiEee43bo6S9i5Mw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vJBOhLAiEee43bo6S9i5Mw"/>
+ </children>
+ <element xmi:type="uml:Class" href="expressionModelTest.uml#_vI55wLAiEee43bo6S9i5Mw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vI_ZUbAiEee43bo6S9i5Mw" x="480" y="240" width="201" height="101"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_BKFAMLAjEee43bo6S9i5Mw" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_BKFAMbAjEee43bo6S9i5Mw"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BKFnQLAjEee43bo6S9i5Mw" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_vI55wLAiEee43bo6S9i5Mw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BKFAMrAjEee43bo6S9i5Mw" x="680" y="240"/>
+ </children>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_S-8MESgzEeeoAJG6t_MwCA" name="diagram_compatibility_version" stringValue="1.3.0"/>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_S-8MEigzEeeoAJG6t_MwCA"/>
+ <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_S-8MEygzEeeoAJG6t_MwCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+ <owner xmi:type="uml:Model" href="expressionModelTest.uml#_8TUvwCgyEeeoAJG6t_MwCA"/>
+ </styles>
+ <element xmi:type="uml:Model" href="expressionModelTest.uml#_8TUvwCgyEeeoAJG6t_MwCA"/>
+ <edges xmi:type="notation:Connector" xmi:id="_3ooXtC0TEee42cCIRX36lw" type="StereotypeCommentLink" source="_TLBLIC0TEee42cCIRX36lw" target="_3ooXsC0TEee42cCIRX36lw">
+ <styles xmi:type="notation:FontStyle" xmi:id="_3ooXtS0TEee42cCIRX36lw"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3ooXuS0TEee42cCIRX36lw" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3ooXti0TEee42cCIRX36lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ooXty0TEee42cCIRX36lw"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ooXuC0TEee42cCIRX36lw"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_A6oHgC0UEee42cCIRX36lw" type="StereotypeCommentLink" source="_UsONQCgzEeeoAJG6t_MwCA" target="_A6ngdC0UEee42cCIRX36lw">
+ <styles xmi:type="notation:FontStyle" xmi:id="_A6oHgS0UEee42cCIRX36lw"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A6oHhS0UEee42cCIRX36lw" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_A6oHgi0UEee42cCIRX36lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6oHgy0UEee42cCIRX36lw"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6oHhC0UEee42cCIRX36lw"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_BKGOULAjEee43bo6S9i5Mw" type="StereotypeCommentLink" source="_vI_ZULAiEee43bo6S9i5Mw" target="_BKFAMLAjEee43bo6S9i5Mw">
+ <styles xmi:type="notation:FontStyle" xmi:id="_BKGOUbAjEee43bo6S9i5Mw"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BKGOVbAjEee43bo6S9i5Mw" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_vI55wLAiEee43bo6S9i5Mw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BKGOUrAjEee43bo6S9i5Mw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BKGOU7AjEee43bo6S9i5Mw"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BKGOVLAjEee43bo6S9i5Mw"/>
+ </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.uml b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.uml
index fefa215f7cf..e3f97da73f1 100755
--- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.uml
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.uml
@@ -1,39 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:RootElement="http:///schemas/RootElement/_AgCXgC8oEeexfKc2E3OwJQ/4" xmlns:RootElement_1="papyrusExpressionProfile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/RootElement/_AgCXgC8oEeexfKc2E3OwJQ/4 expressionProfileWithoutURI.profile.uml#_AgGB4C8oEeexfKc2E3OwJQ papyrusExpressionProfile expressionProfileWithURI.profile.uml#_CjQMcC8oEeexfKc2E3OwJQ">
- <uml:Model xmi:id="_8TUvwCgyEeeoAJG6t_MwCA" name="RootElement">
- <packagedElement xmi:type="uml:Class" xmi:id="_UsJ70CgzEeeoAJG6t_MwCA" name="StereotypedWithURIClass">
- <ownedAttribute xmi:type="uml:Property" xmi:id="_V3npYCgzEeeoAJG6t_MwCA" name="StereotypedWithURIProperty" visibility="public"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_daTXsCgzEeeoAJG6t_MwCA" name="NoStereotypedClass"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_TK3aIC0TEee42cCIRX36lw" name="StereotypedWithoutURIClass"/>
- <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_L-vxsC0TEee42cCIRX36lw">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EAGk8C8oEeexfKc2E3OwJQ" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAGk8S8oEeexfKc2E3OwJQ" key="Version" value="0.0.5"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAGk8i8oEeexfKc2E3OwJQ" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAGk8y8oEeexfKc2E3OwJQ" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAGk9C8oEeexfKc2E3OwJQ" key="Date" value="2017-05-02"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAGk9S8oEeexfKc2E3OwJQ" key="Author" value=""/>
- </eAnnotations>
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_L-0DIC0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="expressionProfileWithoutURI.profile.uml#_AgGB4C8oEeexfKc2E3OwJQ"/>
- </eAnnotations>
- <appliedProfile xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
- </profileApplication>
- <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_xKl9QC0TEee42cCIRX36lw">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EAHzEC8oEeexfKc2E3OwJQ" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzES8oEeexfKc2E3OwJQ" key="Version" value="0.0.8"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzEi8oEeexfKc2E3OwJQ" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzEy8oEeexfKc2E3OwJQ" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzFC8oEeexfKc2E3OwJQ" key="Date" value="2017-05-02"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzFS8oEeexfKc2E3OwJQ" key="Author" value=""/>
- </eAnnotations>
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xKmkUC0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="expressionProfileWithURI.profile.uml#_CjQMcC8oEeexfKc2E3OwJQ"/>
- </eAnnotations>
- <appliedProfile xmi:type="uml:Profile" href="expressionProfileWithURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
- </profileApplication>
- </uml:Model>
- <RootElement:ANiceStereotypeForElement xmi:id="_3objYC0TEee42cCIRX36lw" base_Element="_TK3aIC0TEee42cCIRX36lw"/>
- <RootElement_1:ANiceStereotypeForElement xmi:id="_A6WasC0UEee42cCIRX36lw" base_Element="_UsJ70CgzEeeoAJG6t_MwCA"/>
- <RootElement:ANiceStereotypeForProperty xmi:id="_0vazsC8oEeexfKc2E3OwJQ" base_Property="_V3npYCgzEeeoAJG6t_MwCA"/>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:RootElement="http:///schemas/RootElement/_dHIWYLAiEee43bo6S9i5Mw/5" xmlns:RootElement_1="papyrusExpressionProfile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/RootElement/_dHIWYLAiEee43bo6S9i5Mw/5 expressionProfileWithoutURI.profile.uml#_dHQ5QLAiEee43bo6S9i5Mw papyrusExpressionProfile expressionProfileWithURI.profile.uml#_CjQMcC8oEeexfKc2E3OwJQ">
+ <uml:Model xmi:id="_8TUvwCgyEeeoAJG6t_MwCA" name="RootElement">
+ <packagedElement xmi:type="uml:Class" xmi:id="_UsJ70CgzEeeoAJG6t_MwCA" name="StereotypedWithURIClass">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_V3npYCgzEeeoAJG6t_MwCA" name="StereotypedWithURIProperty" visibility="public"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_daTXsCgzEeeoAJG6t_MwCA" name="NoStereotypedClass"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_TK3aIC0TEee42cCIRX36lw" name="StereotypedWithoutURIClass"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_vI55wLAiEee43bo6S9i5Mw" name="StereotypedWithChildStereotype"/>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_L-vxsC0TEee42cCIRX36lw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9S7vgLAiEee43bo6S9i5Mw" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vgbAiEee43bo6S9i5Mw" key="Version" value="0.0.6"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vgrAiEee43bo6S9i5Mw" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vg7AiEee43bo6S9i5Mw" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vhLAiEee43bo6S9i5Mw" key="Date" value="2017-10-13"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vhbAiEee43bo6S9i5Mw" key="Author" value=""/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_L-0DIC0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="expressionProfileWithoutURI.profile.uml#_dHQ5QLAiEee43bo6S9i5Mw"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_xKl9QC0TEee42cCIRX36lw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EAHzEC8oEeexfKc2E3OwJQ" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzES8oEeexfKc2E3OwJQ" key="Version" value="0.0.8"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzEi8oEeexfKc2E3OwJQ" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzEy8oEeexfKc2E3OwJQ" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzFC8oEeexfKc2E3OwJQ" key="Date" value="2017-05-02"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzFS8oEeexfKc2E3OwJQ" key="Author" value=""/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xKmkUC0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="expressionProfileWithURI.profile.uml#_CjQMcC8oEeexfKc2E3OwJQ"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="expressionProfileWithURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
+ </profileApplication>
+ </uml:Model>
+ <RootElement:ANiceStereotypeForElement xmi:id="_3objYC0TEee42cCIRX36lw" base_Element="_TK3aIC0TEee42cCIRX36lw"/>
+ <RootElement_1:ANiceStereotypeForElement xmi:id="_A6WasC0UEee42cCIRX36lw" base_Element="_UsJ70CgzEeeoAJG6t_MwCA"/>
+ <RootElement:ANiceStereotypeForProperty xmi:id="_0vazsC8oEeexfKc2E3OwJQ" base_Property="_V3npYCgzEeeoAJG6t_MwCA"/>
+ <RootElement:AChildNiceStereotypeForElement xmi:id="_BJua4LAjEee43bo6S9i5Mw" base_Element="_vI55wLAiEee43bo6S9i5Mw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.notation b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.notation
index c1ea329c48c..8e75cbea0a6 100755
--- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.notation
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.notation
@@ -1,117 +1,144 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram 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" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_o0MdkCgyEeeoAJG6t_MwCA" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_tPCRMCgyEeeoAJG6t_MwCA" type="Class_MetaclassShape">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tPI-4CgyEeeoAJG6t_MwCA" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4SgyEeeoAJG6t_MwCA" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4igyEeeoAJG6t_MwCA" key="StereotypeList" value="StandardProfile::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4ygyEeeoAJG6t_MwCA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-5CgyEeeoAJG6t_MwCA" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-5SgyEeeoAJG6t_MwCA" key="StereotypePropertyLocation" value="Compartment"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_tPHwwCgyEeeoAJG6t_MwCA" type="Class_MetaclassNameLabel"/>
- <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tPIX0CgyEeeoAJG6t_MwCA" x="80" y="60" width="201" height="61"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_tP8QICgyEeeoAJG6t_MwCA" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_tP8QISgyEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tP8QIygyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
- </styles>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tP8QIigyEeeoAJG6t_MwCA" x="460" y="60"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_t8oXACgyEeeoAJG6t_MwCA" type="Stereotype_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_t8tPgCgyEeeoAJG6t_MwCA" type="Stereotype_NameLabel"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_t8tPgSgyEeeoAJG6t_MwCA" type="Stereotype_AttributeCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_t8tPgigyEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_t8tPgygyEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_t8tPhCgyEeeoAJG6t_MwCA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8tPhSgyEeeoAJG6t_MwCA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_t8tPhigyEeeoAJG6t_MwCA" type="Stereotype_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_t8tPhygyEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_t8tPiCgyEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_t8tPiSgyEeeoAJG6t_MwCA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8tPiigyEeeoAJG6t_MwCA"/>
- </children>
- <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_t8ksoCgyEeeoAJG6t_MwCA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8oXASgyEeeoAJG6t_MwCA" x="80" y="280" width="201"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_yoxWACgyEeeoAJG6t_MwCA" type="Stereotype_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_yox9ECgyEeeoAJG6t_MwCA" type="Stereotype_NameLabel"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_yox9ESgyEeeoAJG6t_MwCA" type="Stereotype_AttributeCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_yox9EigyEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_yox9EygyEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_yox9FCgyEeeoAJG6t_MwCA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yox9FSgyEeeoAJG6t_MwCA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_yox9FigyEeeoAJG6t_MwCA" type="Stereotype_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_yox9FygyEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_yox9GCgyEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_yox9GSgyEeeoAJG6t_MwCA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yox9GigyEeeoAJG6t_MwCA"/>
- </children>
- <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_yokhsCgyEeeoAJG6t_MwCA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yoxWASgyEeeoAJG6t_MwCA" x="440" y="280" width="201"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_1_0KUCgyEeeoAJG6t_MwCA" type="Class_MetaclassShape">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1_0xYCgyEeeoAJG6t_MwCA" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYSgyEeeoAJG6t_MwCA" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYigyEeeoAJG6t_MwCA" key="StereotypeList" value="StandardProfile::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYygyEeeoAJG6t_MwCA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xZCgyEeeoAJG6t_MwCA" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xZSgyEeeoAJG6t_MwCA" key="StereotypePropertyLocation" value="Compartment"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_1_0KUigyEeeoAJG6t_MwCA" type="Class_MetaclassNameLabel"/>
- <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1_0KUygyEeeoAJG6t_MwCA" x="440" y="60" width="201" height="61"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_1_-iYygyEeeoAJG6t_MwCA" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_1_-iZCgyEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1_-iZigyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- </styles>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1_-iZSgyEeeoAJG6t_MwCA" x="700" y="60"/>
- </children>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_o0MdkSgyEeeoAJG6t_MwCA" name="diagram_compatibility_version" stringValue="1.3.0"/>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_o0MdkigyEeeoAJG6t_MwCA"/>
- <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_o0MdkygyEeeoAJG6t_MwCA" diagramKindId="org.eclipse.papyrus.uml.diagram.profile">
- <owner xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
- </styles>
- <element xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
- <edges xmi:type="notation:Connector" xmi:id="_tP83MCgyEeeoAJG6t_MwCA" type="StereotypeCommentLink" source="_tPCRMCgyEeeoAJG6t_MwCA" target="_tP8QICgyEeeoAJG6t_MwCA">
- <styles xmi:type="notation:FontStyle" xmi:id="_tP83MSgyEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tP9eQSgyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tP83MigyEeeoAJG6t_MwCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tP83MygyEeeoAJG6t_MwCA"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tP9eQCgyEeeoAJG6t_MwCA"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_1_-iZygyEeeoAJG6t_MwCA" type="StereotypeCommentLink" source="_1_0KUCgyEeeoAJG6t_MwCA" target="_1_-iYygyEeeoAJG6t_MwCA">
- <styles xmi:type="notation:FontStyle" xmi:id="_1_-iaCgyEeeoAJG6t_MwCA"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1__JcCgyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1_-iaSgyEeeoAJG6t_MwCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1_-iaigyEeeoAJG6t_MwCA"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1_-iaygyEeeoAJG6t_MwCA"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_3g-bECgyEeeoAJG6t_MwCA" type="Extension_Edge" source="_t8oXACgyEeeoAJG6t_MwCA" target="_tPCRMCgyEeeoAJG6t_MwCA">
- <styles xmi:type="notation:FontStyle" xmi:id="_3g-bESgyEeeoAJG6t_MwCA"/>
- <element xmi:type="uml:Extension" href="expressionProfileWithoutURI.profile.uml#_3gxmwCgyEeeoAJG6t_MwCA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3g-bEigyEeeoAJG6t_MwCA" points="[140, 280, -643984, -643984]$[140, 110, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3hUZUCgyEeeoAJG6t_MwCA" id="(0.4975124378109453,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3hUZUSgyEeeoAJG6t_MwCA" id="(0.4975124378109453,1.0)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_4GY1QCgyEeeoAJG6t_MwCA" type="Extension_Edge" source="_yoxWACgyEeeoAJG6t_MwCA" target="_1_0KUCgyEeeoAJG6t_MwCA">
- <styles xmi:type="notation:FontStyle" xmi:id="_4GY1QSgyEeeoAJG6t_MwCA"/>
- <element xmi:type="uml:Extension" href="expressionProfileWithoutURI.profile.uml#_4GMA8CgyEeeoAJG6t_MwCA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4GY1QigyEeeoAJG6t_MwCA" points="[500, 280, -643984, -643984]$[500, 110, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4Gm3sCgyEeeoAJG6t_MwCA" id="(0.4975124378109453,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4Gm3sSgyEeeoAJG6t_MwCA" id="(0.4975124378109453,1.0)"/>
- </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram 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" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_o0MdkCgyEeeoAJG6t_MwCA" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_tPCRMCgyEeeoAJG6t_MwCA" type="Class_MetaclassShape">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tPI-4CgyEeeoAJG6t_MwCA" source="Stereotype_Annotation">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4SgyEeeoAJG6t_MwCA" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4igyEeeoAJG6t_MwCA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4ygyEeeoAJG6t_MwCA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-5CgyEeeoAJG6t_MwCA" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-5SgyEeeoAJG6t_MwCA" key="StereotypePropertyLocation" value="Compartment"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_tPHwwCgyEeeoAJG6t_MwCA" type="Class_MetaclassNameLabel"/>
+ <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tPIX0CgyEeeoAJG6t_MwCA" x="80" y="60" width="201" height="61"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_tP8QICgyEeeoAJG6t_MwCA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_tP8QISgyEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tP8QIygyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tP8QIigyEeeoAJG6t_MwCA" x="460" y="60"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_t8oXACgyEeeoAJG6t_MwCA" type="Stereotype_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_t8tPgCgyEeeoAJG6t_MwCA" type="Stereotype_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_t8tPgSgyEeeoAJG6t_MwCA" type="Stereotype_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_t8tPgigyEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_t8tPgygyEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_t8tPhCgyEeeoAJG6t_MwCA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8tPhSgyEeeoAJG6t_MwCA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_t8tPhigyEeeoAJG6t_MwCA" type="Stereotype_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_t8tPhygyEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_t8tPiCgyEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_t8tPiSgyEeeoAJG6t_MwCA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8tPiigyEeeoAJG6t_MwCA"/>
+ </children>
+ <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_t8ksoCgyEeeoAJG6t_MwCA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8oXASgyEeeoAJG6t_MwCA" x="80" y="280" width="201"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_yoxWACgyEeeoAJG6t_MwCA" type="Stereotype_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_yox9ECgyEeeoAJG6t_MwCA" type="Stereotype_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_yox9ESgyEeeoAJG6t_MwCA" type="Stereotype_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_yox9EigyEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_yox9EygyEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_yox9FCgyEeeoAJG6t_MwCA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yox9FSgyEeeoAJG6t_MwCA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_yox9FigyEeeoAJG6t_MwCA" type="Stereotype_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_yox9FygyEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_yox9GCgyEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_yox9GSgyEeeoAJG6t_MwCA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yox9GigyEeeoAJG6t_MwCA"/>
+ </children>
+ <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_yokhsCgyEeeoAJG6t_MwCA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yoxWASgyEeeoAJG6t_MwCA" x="440" y="280" width="201"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_1_0KUCgyEeeoAJG6t_MwCA" type="Class_MetaclassShape">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1_0xYCgyEeeoAJG6t_MwCA" source="Stereotype_Annotation">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYSgyEeeoAJG6t_MwCA" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYigyEeeoAJG6t_MwCA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYygyEeeoAJG6t_MwCA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xZCgyEeeoAJG6t_MwCA" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xZSgyEeeoAJG6t_MwCA" key="StereotypePropertyLocation" value="Compartment"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_1_0KUigyEeeoAJG6t_MwCA" type="Class_MetaclassNameLabel"/>
+ <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1_0KUygyEeeoAJG6t_MwCA" x="440" y="60" width="201" height="61"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_1_-iYygyEeeoAJG6t_MwCA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_1_-iZCgyEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1_-iZigyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1_-iZSgyEeeoAJG6t_MwCA" x="700" y="60"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_WW-4QLAiEee43bo6S9i5Mw" type="Stereotype_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_WXDwwLAiEee43bo6S9i5Mw" type="Stereotype_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_WXDwwbAiEee43bo6S9i5Mw" type="Stereotype_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_WXDwwrAiEee43bo6S9i5Mw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_WXDww7AiEee43bo6S9i5Mw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_WXDwxLAiEee43bo6S9i5Mw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WXDwxbAiEee43bo6S9i5Mw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_WXEX0LAiEee43bo6S9i5Mw" type="Stereotype_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_WXEX0bAiEee43bo6S9i5Mw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_WXEX0rAiEee43bo6S9i5Mw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_WXEX07AiEee43bo6S9i5Mw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WXEX1LAiEee43bo6S9i5Mw"/>
+ </children>
+ <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_WW0gMLAiEee43bo6S9i5Mw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WW-4QbAiEee43bo6S9i5Mw" x="80" y="520" width="201"/>
+ </children>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_o0MdkSgyEeeoAJG6t_MwCA" name="diagram_compatibility_version" stringValue="1.3.0"/>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_o0MdkigyEeeoAJG6t_MwCA"/>
+ <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_o0MdkygyEeeoAJG6t_MwCA" diagramKindId="org.eclipse.papyrus.uml.diagram.profile">
+ <owner xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
+ </styles>
+ <element xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
+ <edges xmi:type="notation:Connector" xmi:id="_tP83MCgyEeeoAJG6t_MwCA" type="StereotypeCommentLink" source="_tPCRMCgyEeeoAJG6t_MwCA" target="_tP8QICgyEeeoAJG6t_MwCA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_tP83MSgyEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tP9eQSgyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tP83MigyEeeoAJG6t_MwCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tP83MygyEeeoAJG6t_MwCA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tP9eQCgyEeeoAJG6t_MwCA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_1_-iZygyEeeoAJG6t_MwCA" type="StereotypeCommentLink" source="_1_0KUCgyEeeoAJG6t_MwCA" target="_1_-iYygyEeeoAJG6t_MwCA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_1_-iaCgyEeeoAJG6t_MwCA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1__JcCgyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1_-iaSgyEeeoAJG6t_MwCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1_-iaigyEeeoAJG6t_MwCA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1_-iaygyEeeoAJG6t_MwCA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_3g-bECgyEeeoAJG6t_MwCA" type="Extension_Edge" source="_t8oXACgyEeeoAJG6t_MwCA" target="_tPCRMCgyEeeoAJG6t_MwCA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_3g-bESgyEeeoAJG6t_MwCA"/>
+ <element xmi:type="uml:Extension" href="expressionProfileWithoutURI.profile.uml#_3gxmwCgyEeeoAJG6t_MwCA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3g-bEigyEeeoAJG6t_MwCA" points="[140, 280, -643984, -643984]$[140, 110, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3hUZUCgyEeeoAJG6t_MwCA" id="(0.4975124378109453,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3hUZUSgyEeeoAJG6t_MwCA" id="(0.4975124378109453,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_4GY1QCgyEeeoAJG6t_MwCA" type="Extension_Edge" source="_yoxWACgyEeeoAJG6t_MwCA" target="_1_0KUCgyEeeoAJG6t_MwCA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_4GY1QSgyEeeoAJG6t_MwCA"/>
+ <element xmi:type="uml:Extension" href="expressionProfileWithoutURI.profile.uml#_4GMA8CgyEeeoAJG6t_MwCA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4GY1QigyEeeoAJG6t_MwCA" points="[500, 280, -643984, -643984]$[500, 110, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4Gm3sCgyEeeoAJG6t_MwCA" id="(0.4975124378109453,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4Gm3sSgyEeeoAJG6t_MwCA" id="(0.4975124378109453,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_Xeq5ELAiEee43bo6S9i5Mw" type="Generalization_Edge" source="_WW-4QLAiEee43bo6S9i5Mw" target="_t8oXACgyEeeoAJG6t_MwCA">
+ <children xmi:type="notation:DecorationNode" xmi:id="_XergILAiEee43bo6S9i5Mw" type="Generalization_StereotypeLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_XergIbAiEee43bo6S9i5Mw" y="60"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_Xeq5EbAiEee43bo6S9i5Mw"/>
+ <element xmi:type="uml:Generalization" href="expressionProfileWithoutURI.profile.uml#_XeTssLAiEee43bo6S9i5Mw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xeq5ErAiEee43bo6S9i5Mw" points="[160, 520, -643984, -643984]$[160, 380, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XfZ44LAiEee43bo6S9i5Mw" id="(0.39800995024875624,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xfaf8LAiEee43bo6S9i5Mw" id="(0.39800995024875624,1.0)"/>
+ </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.uml b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.uml
index 80f816e44a9..f4f8c0089ba 100755
--- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.uml
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.uml
@@ -1,132 +1,159 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ozrgMCgyEeeoAJG6t_MwCA" name="RootElement" metaclassReference="_tOxygCgyEeeoAJG6t_MwCA _1_y8MCgyEeeoAJG6t_MwCA">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuUCgyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <contents xmi:type="ecore:EPackage" xmi:id="_AgGB4C8oEeexfKc2E3OwJQ" name="RootElement" nsURI="http:///schemas/RootElement/_AgCXgC8oEeexfKc2E3OwJQ/4" nsPrefix="RootElement">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgH3Ei8oEeexfKc2E3OwJQ" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIC8oEeexfKc2E3OwJQ" key="Version" value="0.0.5"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIS8oEeexfKc2E3OwJQ" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIi8oEeexfKc2E3OwJQ" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIy8oEeexfKc2E3OwJQ" key="Date" value="2017-05-02"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeJC8oEeexfKc2E3OwJQ" key="Author" value=""/>
- </eAnnotations>
- <eClassifiers xmi:type="ecore:EClass" xmi:id="_AgGB4S8oEeexfKc2E3OwJQ" name="ANiceStereotypeForElement">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgGB4i8oEeexfKc2E3OwJQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
- <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_AgGB4y8oEeexfKc2E3OwJQ" name="base_Element" ordered="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xmi:type="ecore:EClass" xmi:id="_AgGB5S8oEeexfKc2E3OwJQ" name="ANiceStereotypeForProperty">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgGB5i8oEeexfKc2E3OwJQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
- <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_AgGB5y8oEeexfKc2E3OwJQ" name="base_Property" ordered="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
- </eStructuralFeatures>
- </eClassifiers>
- </contents>
- <contents xmi:type="ecore:EPackage" xmi:id="_uDXtoC0TEee42cCIRX36lw" name="ProfileWithoutURI" nsURI="http:///schemas/ProfileWithoutURI/_uDXGkC0TEee42cCIRX36lw/3" nsPrefix="ProfileWithoutURI">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDYUsS0TEee42cCIRX36lw" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUsi0TEee42cCIRX36lw" key="Version" value="0.0.4"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUsy0TEee42cCIRX36lw" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUtC0TEee42cCIRX36lw" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUtS0TEee42cCIRX36lw" key="Date" value="2017-04-29"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUti0TEee42cCIRX36lw" key="Author" value=""/>
- </eAnnotations>
- <eClassifiers xmi:type="ecore:EClass" xmi:id="_uDXtoS0TEee42cCIRX36lw" name="ANiceStereotypeForElement">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDXtoi0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
- <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_uDXtoy0TEee42cCIRX36lw" name="base_Element" ordered="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xmi:type="ecore:EClass" xmi:id="_uDXtpS0TEee42cCIRX36lw" name="ANiceStereotypeForProperty">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDXtpi0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
- <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_uDXtpy0TEee42cCIRX36lw" name="base_Property" ordered="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
- </eStructuralFeatures>
- </eClassifiers>
- </contents>
- <contents xmi:type="ecore:EPackage" xmi:id="_8NYKsC0SEee42cCIRX36lw" name="ProfileWithoutNsURI" nsURI="http:///schemas/ProfileWithoutNsURI/_8NWVgC0SEee42cCIRX36lw/2" nsPrefix="ProfileWithoutNsURI">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8Nam8S0SEee42cCIRX36lw" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam8i0SEee42cCIRX36lw" key="Version" value="0.0.3"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam8y0SEee42cCIRX36lw" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9C0SEee42cCIRX36lw" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9S0SEee42cCIRX36lw" key="Date" value="2017-04-29"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9i0SEee42cCIRX36lw" key="Author" value=""/>
- </eAnnotations>
- <eClassifiers xmi:type="ecore:EClass" xmi:id="_8NYKsS0SEee42cCIRX36lw" name="ANiceStereotypeForElement">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8NYKsi0SEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
- <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8NYKsy0SEee42cCIRX36lw" name="base_Element" ordered="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xmi:type="ecore:EClass" xmi:id="_8NYKtS0SEee42cCIRX36lw" name="ANiceStereotypeForProperty">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8NYKti0SEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
- <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8NYKty0SEee42cCIRX36lw" name="base_Property" ordered="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
- </eStructuralFeatures>
- </eClassifiers>
- </contents>
- <contents xmi:type="ecore:EPackage" xmi:id="_PrrrkSgzEeeoAJG6t_MwCA" name="RootElement" nsURI="http:///schemas/RootElement/_PrrrkCgzEeeoAJG6t_MwCA/1" nsPrefix="RootElement">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrsSoigzEeeoAJG6t_MwCA" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSoygzEeeoAJG6t_MwCA" key="Version" value="0.0.2"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpCgzEeeoAJG6t_MwCA" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpSgzEeeoAJG6t_MwCA" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpigzEeeoAJG6t_MwCA" key="Date" value="2017-04-23"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpygzEeeoAJG6t_MwCA" key="Author" value=""/>
- </eAnnotations>
- <eClassifiers xmi:type="ecore:EClass" xmi:id="_PrrrkigzEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrrrkygzEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
- <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PrrrlCgzEeeoAJG6t_MwCA" name="base_Element" ordered="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xmi:type="ecore:EClass" xmi:id="_PrrrligzEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrrrlygzEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
- <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PrrrmCgzEeeoAJG6t_MwCA" name="base_Property" ordered="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
- </eStructuralFeatures>
- </eClassifiers>
- </contents>
- <contents xmi:type="ecore:EPackage" xmi:id="_41FuUSgyEeeoAJG6t_MwCA" name="RootElement" nsURI="http:///schemas/RootElement/_41CrACgyEeeoAJG6t_MwCA/0" nsPrefix="RootElement">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41HjgigyEeeoAJG6t_MwCA" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjgygyEeeoAJG6t_MwCA" key="Version" value="0.0.1"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhCgyEeeoAJG6t_MwCA" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhSgyEeeoAJG6t_MwCA" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhigyEeeoAJG6t_MwCA" key="Date" value="2017-04-23"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhygyEeeoAJG6t_MwCA" key="Author" value=""/>
- </eAnnotations>
- <eClassifiers xmi:type="ecore:EClass" xmi:id="_41FuUigyEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuUygyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
- <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_41FuVCgyEeeoAJG6t_MwCA" name="base_Element" ordered="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xmi:type="ecore:EClass" xmi:id="_41FuVigyEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuVygyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
- <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_41FuWCgyEeeoAJG6t_MwCA" name="base_Property" ordered="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
- </eStructuralFeatures>
- </eClassifiers>
- </contents>
- </eAnnotations>
- <elementImport xmi:type="uml:ElementImport" xmi:id="_tOxygCgyEeeoAJG6t_MwCA" alias="Element">
- <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
- </elementImport>
- <elementImport xmi:type="uml:ElementImport" xmi:id="_1_y8MCgyEeeoAJG6t_MwCA" alias="Property">
- <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- </elementImport>
- <packagedElement xmi:type="uml:Stereotype" xmi:id="_t8ksoCgyEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">
- <ownedAttribute xmi:type="uml:Property" xmi:id="_3g1RISgyEeeoAJG6t_MwCA" name="base_Element" association="_3gxmwCgyEeeoAJG6t_MwCA">
- <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Stereotype" xmi:id="_yokhsCgyEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">
- <ownedAttribute xmi:type="uml:Property" xmi:id="_4GNPECgyEeeoAJG6t_MwCA" name="base_Property" association="_4GMA8CgyEeeoAJG6t_MwCA">
- <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Extension" xmi:id="_3gxmwCgyEeeoAJG6t_MwCA" name="E_ANiceStereotypeForElement_Element1" memberEnd="_3g1RICgyEeeoAJG6t_MwCA _3g1RISgyEeeoAJG6t_MwCA">
- <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_3g1RICgyEeeoAJG6t_MwCA" name="extension_ANiceStereotypeForElement" type="_t8ksoCgyEeeoAJG6t_MwCA" aggregation="composite" association="_3gxmwCgyEeeoAJG6t_MwCA"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Extension" xmi:id="_4GMA8CgyEeeoAJG6t_MwCA" name="E_ANiceStereotypeForProperty_Property1" memberEnd="_4GMoACgyEeeoAJG6t_MwCA _4GNPECgyEeeoAJG6t_MwCA">
- <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_4GMoACgyEeeoAJG6t_MwCA" name="extension_ANiceStereotypeForProperty" type="_yokhsCgyEeeoAJG6t_MwCA" aggregation="composite" association="_4GMA8CgyEeeoAJG6t_MwCA"/>
- </packagedElement>
-</uml:Profile>
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ozrgMCgyEeeoAJG6t_MwCA" name="RootElement" metaclassReference="_tOxygCgyEeeoAJG6t_MwCA _1_y8MCgyEeeoAJG6t_MwCA">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuUCgyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <contents xmi:type="ecore:EPackage" xmi:id="_dHQ5QLAiEee43bo6S9i5Mw" name="RootElement" nsURI="http:///schemas/RootElement/_dHIWYLAiEee43bo6S9i5Mw/5" nsPrefix="RootElement">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHT8kLAiEee43bo6S9i5Mw" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8kbAiEee43bo6S9i5Mw" key="Version" value="0.0.6"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8krAiEee43bo6S9i5Mw" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8k7AiEee43bo6S9i5Mw" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8lLAiEee43bo6S9i5Mw" key="Date" value="2017-10-13"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8lbAiEee43bo6S9i5Mw" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_dHQ5QbAiEee43bo6S9i5Mw" name="ANiceStereotypeForElement">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHQ5QrAiEee43bo6S9i5Mw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dHQ5Q7AiEee43bo6S9i5Mw" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_dHQ5RbAiEee43bo6S9i5Mw" name="ANiceStereotypeForProperty">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHQ5RrAiEee43bo6S9i5Mw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dHQ5R7AiEee43bo6S9i5Mw" name="base_Property" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_dHQ5SbAiEee43bo6S9i5Mw" name="AChildNiceStereotypeForElement" eSuperTypes="_dHQ5QbAiEee43bo6S9i5Mw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHQ5SrAiEee43bo6S9i5Mw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WW0gMLAiEee43bo6S9i5Mw"/>
+ </eClassifiers>
+ </contents>
+ <contents xmi:type="ecore:EPackage" xmi:id="_AgGB4C8oEeexfKc2E3OwJQ" name="RootElement" nsURI="http:///schemas/RootElement/_AgCXgC8oEeexfKc2E3OwJQ/4" nsPrefix="RootElement">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgH3Ei8oEeexfKc2E3OwJQ" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIC8oEeexfKc2E3OwJQ" key="Version" value="0.0.5"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIS8oEeexfKc2E3OwJQ" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIi8oEeexfKc2E3OwJQ" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIy8oEeexfKc2E3OwJQ" key="Date" value="2017-05-02"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeJC8oEeexfKc2E3OwJQ" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_AgGB4S8oEeexfKc2E3OwJQ" name="ANiceStereotypeForElement">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgGB4i8oEeexfKc2E3OwJQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_AgGB4y8oEeexfKc2E3OwJQ" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_AgGB5S8oEeexfKc2E3OwJQ" name="ANiceStereotypeForProperty">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgGB5i8oEeexfKc2E3OwJQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_AgGB5y8oEeexfKc2E3OwJQ" name="base_Property" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ </contents>
+ <contents xmi:type="ecore:EPackage" xmi:id="_uDXtoC0TEee42cCIRX36lw" name="ProfileWithoutURI" nsURI="http:///schemas/ProfileWithoutURI/_uDXGkC0TEee42cCIRX36lw/3" nsPrefix="ProfileWithoutURI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDYUsS0TEee42cCIRX36lw" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUsi0TEee42cCIRX36lw" key="Version" value="0.0.4"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUsy0TEee42cCIRX36lw" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUtC0TEee42cCIRX36lw" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUtS0TEee42cCIRX36lw" key="Date" value="2017-04-29"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUti0TEee42cCIRX36lw" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_uDXtoS0TEee42cCIRX36lw" name="ANiceStereotypeForElement">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDXtoi0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_uDXtoy0TEee42cCIRX36lw" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_uDXtpS0TEee42cCIRX36lw" name="ANiceStereotypeForProperty">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDXtpi0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_uDXtpy0TEee42cCIRX36lw" name="base_Property" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ </contents>
+ <contents xmi:type="ecore:EPackage" xmi:id="_8NYKsC0SEee42cCIRX36lw" name="ProfileWithoutNsURI" nsURI="http:///schemas/ProfileWithoutNsURI/_8NWVgC0SEee42cCIRX36lw/2" nsPrefix="ProfileWithoutNsURI">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8Nam8S0SEee42cCIRX36lw" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam8i0SEee42cCIRX36lw" key="Version" value="0.0.3"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam8y0SEee42cCIRX36lw" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9C0SEee42cCIRX36lw" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9S0SEee42cCIRX36lw" key="Date" value="2017-04-29"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9i0SEee42cCIRX36lw" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_8NYKsS0SEee42cCIRX36lw" name="ANiceStereotypeForElement">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8NYKsi0SEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8NYKsy0SEee42cCIRX36lw" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_8NYKtS0SEee42cCIRX36lw" name="ANiceStereotypeForProperty">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8NYKti0SEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8NYKty0SEee42cCIRX36lw" name="base_Property" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ </contents>
+ <contents xmi:type="ecore:EPackage" xmi:id="_PrrrkSgzEeeoAJG6t_MwCA" name="RootElement" nsURI="http:///schemas/RootElement/_PrrrkCgzEeeoAJG6t_MwCA/1" nsPrefix="RootElement">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrsSoigzEeeoAJG6t_MwCA" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSoygzEeeoAJG6t_MwCA" key="Version" value="0.0.2"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpCgzEeeoAJG6t_MwCA" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpSgzEeeoAJG6t_MwCA" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpigzEeeoAJG6t_MwCA" key="Date" value="2017-04-23"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpygzEeeoAJG6t_MwCA" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_PrrrkigzEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrrrkygzEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PrrrlCgzEeeoAJG6t_MwCA" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_PrrrligzEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrrrlygzEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PrrrmCgzEeeoAJG6t_MwCA" name="base_Property" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ </contents>
+ <contents xmi:type="ecore:EPackage" xmi:id="_41FuUSgyEeeoAJG6t_MwCA" name="RootElement" nsURI="http:///schemas/RootElement/_41CrACgyEeeoAJG6t_MwCA/0" nsPrefix="RootElement">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41HjgigyEeeoAJG6t_MwCA" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjgygyEeeoAJG6t_MwCA" key="Version" value="0.0.1"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhCgyEeeoAJG6t_MwCA" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhSgyEeeoAJG6t_MwCA" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhigyEeeoAJG6t_MwCA" key="Date" value="2017-04-23"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhygyEeeoAJG6t_MwCA" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_41FuUigyEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuUygyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_41FuVCgyEeeoAJG6t_MwCA" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_41FuVigyEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuVygyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_41FuWCgyEeeoAJG6t_MwCA" name="base_Property" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ </contents>
+ </eAnnotations>
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_tOxygCgyEeeoAJG6t_MwCA" alias="Element">
+ <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ </elementImport>
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_1_y8MCgyEeeoAJG6t_MwCA" alias="Property">
+ <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+ </elementImport>
+ <packagedElement xmi:type="uml:Stereotype" xmi:id="_t8ksoCgyEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_3g1RISgyEeeoAJG6t_MwCA" name="base_Element" association="_3gxmwCgyEeeoAJG6t_MwCA">
+ <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Stereotype" xmi:id="_yokhsCgyEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_4GNPECgyEeeoAJG6t_MwCA" name="base_Property" association="_4GMA8CgyEeeoAJG6t_MwCA">
+ <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_3gxmwCgyEeeoAJG6t_MwCA" name="E_ANiceStereotypeForElement_Element1" memberEnd="_3g1RICgyEeeoAJG6t_MwCA _3g1RISgyEeeoAJG6t_MwCA">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_3g1RICgyEeeoAJG6t_MwCA" name="extension_ANiceStereotypeForElement" type="_t8ksoCgyEeeoAJG6t_MwCA" aggregation="composite" association="_3gxmwCgyEeeoAJG6t_MwCA"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_4GMA8CgyEeeoAJG6t_MwCA" name="E_ANiceStereotypeForProperty_Property1" memberEnd="_4GMoACgyEeeoAJG6t_MwCA _4GNPECgyEeeoAJG6t_MwCA">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_4GMoACgyEeeoAJG6t_MwCA" name="extension_ANiceStereotypeForProperty" type="_yokhsCgyEeeoAJG6t_MwCA" aggregation="composite" association="_4GMA8CgyEeeoAJG6t_MwCA"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Stereotype" xmi:id="_WW0gMLAiEee43bo6S9i5Mw" name="AChildNiceStereotypeForElement">
+ <generalization xmi:type="uml:Generalization" xmi:id="_XeTssLAiEee43bo6S9i5Mw" general="_t8ksoCgyEeeoAJG6t_MwCA"/>
+ </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/src/org/eclipse/papyrus/uml/expressions/tests/IsKindOfStereotypeExpressionTests.java b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/src/org/eclipse/papyrus/uml/expressions/tests/IsKindOfStereotypeExpressionTests.java
new file mode 100644
index 00000000000..8937ed5a842
--- /dev/null
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/src/org/eclipse/papyrus/uml/expressions/tests/IsKindOfStereotypeExpressionTests.java
@@ -0,0 +1,308 @@
+/**
+ * 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 v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.expressions.tests;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression;
+import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsFactory;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Property;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ *
+ * Tests for {@link IsKindOfStereotypeExpression}
+ *
+ */
+@PluginResource("resources/expressionModelTest.di") //$NON-NLS-1$
+public class IsKindOfStereotypeExpressionTests {
+
+ private final EObject dummyEObject = EcoreFactory.eINSTANCE.createEClass();
+
+ private final String INVALID_STRING_QN = "Invalid::Qualified::Name"; //$NON-NLS-1$
+
+ private final String STEREOTYPED_CLASS_WITH_URI_NAME = "StereotypedWithURIClass"; //$NON-NLS-1$
+
+ private final String STEREOTYPED_CLASS_WITHOUT_URI_NAME = "StereotypedWithoutURIClass"; //$NON-NLS-1$
+
+ private final String STEREOTYPED_PROPERTY = "StereotypedWithURIProperty"; //$NON-NLS-1$
+
+ private final String STEREOTYPED_CLASS_WITH_CHILD_STEREOTYPE = "StereotypedWithChildStereotype"; //$NON-NLS-1$
+
+ private final String NOT_STEREOTYPED_CLASS_NAME = "NoStereotypedClass"; //$NON-NLS-1$
+
+ private final String ELEMENT_STEREOTYPE_QUALIFIED_NAME = "RootElement::ANiceStereotypeForElement"; //$NON-NLS-1$
+
+ private final String ELEMENT_CHILD_STEREOTYPE_QUALIFIED_NAME = "RootElement::AChildNiceStereotypeForElement"; //$NON-NLS-1$
+
+
+ private final String PROPERTY_STEREOTYPED_QUALIFIED_NAME = "RootElement::ANiceStereotypeForProperty"; //$NON-NLS-1$
+
+ private Class stereotypedClassWithURI;
+
+ private Class stereotypedClassWithoutURI;
+
+ private Class notStereotypedClass;
+
+ private Class childStereotypedClass;
+
+ private Property stereotypedProperty;
+
+ private final String PROFILE_URI = "papyrusExpressionProfile"; //$NON-NLS-1$
+
+ @Rule
+ public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();
+
+
+ @Before
+ public void init() {
+ stereotypedClassWithURI = (Class) fixture.getModel().getMember(STEREOTYPED_CLASS_WITH_URI_NAME);
+ stereotypedClassWithoutURI = (Class) fixture.getModel().getMember(STEREOTYPED_CLASS_WITHOUT_URI_NAME);
+ notStereotypedClass = (Class) fixture.getModel().getMember(NOT_STEREOTYPED_CLASS_NAME);
+ stereotypedProperty = (Property) stereotypedClassWithURI.getOwnedMember(STEREOTYPED_PROPERTY);
+ childStereotypedClass = (Class) fixture.getModel().getMember(STEREOTYPED_CLASS_WITH_CHILD_STEREOTYPE);
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code>
+ * <li>
+ * <li>stereotypeQN is <code>null</code></li>
+ * <li>context is <code>null</code></li>
+ * </ul>
+ */
+ @Test
+ public void IsKindOfStereotypeExpression_Test1() {
+ final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+ Assert.assertFalse(exp.evaluate(null));
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is <code>null</code></li>
+ * <li>context is an EObject, but not an UML Element</li>
+ * </ul>
+ */
+ @Test
+ public void IsKindOfStereotypeExpression_Test2() {
+ final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+ Assert.assertFalse(exp.evaluate(dummyEObject));
+ }
+
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is invalid</li>
+ * <li>context is <code>null</code></li>
+ * </ul>
+ */
+ @Test
+ public void IsKindOfStereotypeExpression_Test3() {
+ final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(INVALID_STRING_QN);
+ Assert.assertFalse(exp.evaluate(null));
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is invalid</li>
+ * <li>context is an EObject, but not an UML Element</li>
+ * </ul>
+ */
+ @Test
+ public void IsKindOfStereotypeExpression_Test4() {
+ final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(INVALID_STRING_QN);
+ Assert.assertFalse(exp.evaluate(dummyEObject));
+ }
+
+ /**
+ * The evaluate method must return <code>true</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML Stereotyped element with the expected stereotype</li>
+ * </ul>
+ */
+ @Test
+ public void IsKindOfStereotypeExpression_Test5() {
+ final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+ Assert.assertTrue(exp.evaluate(this.stereotypedClassWithURI));
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML Stereotyped element but not with the expected property</li>
+ * </ul>
+ */
+ @Test
+ public void IsKindOfStereotypeExpression_Test6() {
+ final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+ Assert.assertFalse(exp.evaluate(stereotypedProperty));
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML element not stereotyped</li>
+ * </ul>
+ */
+ @Test
+ public void IsKindOfStereotypeExpression_Test7() {
+ final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+ Assert.assertFalse(exp.evaluate(notStereotypedClass));
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML element, but the stereotyped with the expected stereotype</li>
+ * </ul>
+ */
+ @Test
+ public void IsKindOfStereotypeExpression_Test8() {
+ final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+ Assert.assertFalse(exp.evaluate(stereotypedClassWithURI));
+ }
+
+ /**
+ * The evaluate method must return <code>true</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML element, stereotyped with the expected stereotype</li>
+ * </ul>
+ */
+ @Test
+ public void IsKindOfStereotypeExpression_Test9() {
+ final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+ Assert.assertTrue(exp.evaluate(stereotypedProperty));
+ }
+
+ /**
+ * The evaluate method must return <code>true</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is not <code>null</code></li>, but empty
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML element, stereotyped with the expected stereotype</li>
+ * </ul>
+ */
+ @Test
+ public void IsKindOfStereotypeExpression_Test10() {
+ final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+ exp.setProfileURI(""); //$NON-NLS-1$
+ exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+ Assert.assertTrue(exp.evaluate(stereotypedProperty));
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML element,nto stereotyped</li>
+ * </ul>
+ */
+ @Test
+ public void IsKindOfStereotypeExpression_Test11() {
+ final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+ Assert.assertFalse(exp.evaluate(notStereotypedClass));
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML element stereotyped by a stereotype with the expected qualified name, but from the bas profile</li>
+ * </ul>
+ */
+ @Test
+ public void IsKindOfStereotypeExpression_Test12() {
+ final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+ exp.setProfileURI(PROFILE_URI);
+ Assert.assertFalse(exp.evaluate(this.stereotypedClassWithoutURI));
+ }
+
+ /**
+ * The evaluate method must return <code>true</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML element stereotyped by a stereotype with the expected qualified name, but from the bas profile</li>
+ * </ul>
+ */
+ @Test
+ public void IsKindOfStereotypeExpression_Test13() {
+ final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+ exp.setProfileURI(PROFILE_URI);
+ Assert.assertTrue(exp.evaluate(this.stereotypedClassWithURI));
+ }
+
+ /**
+ * The evaluate method must return <code>true</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML element stereotyped by a child stereotype and the parent stereotype is defined for the qualified name</li>
+ * </ul>
+ */
+ @Test
+ public void IsKindOfStereotypeExpression_Test14() {
+ final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+ Assert.assertTrue(exp.evaluate(this.childStereotypedClass));
+ }
+}
diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/src/org/eclipse/papyrus/uml/expressions/tests/IsTypeOfStereotypeExpressionTests.java b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/src/org/eclipse/papyrus/uml/expressions/tests/IsTypeOfStereotypeExpressionTests.java
new file mode 100644
index 00000000000..30a43d92170
--- /dev/null
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/src/org/eclipse/papyrus/uml/expressions/tests/IsTypeOfStereotypeExpressionTests.java
@@ -0,0 +1,284 @@
+/**
+ * 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 v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Asma Smaoui (CEA LIST) asma.smaoui@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.expressions.tests;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression;
+import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsFactory;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Property;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ *
+ * Tests for {@link IsTypeOfStereotypeExpression}
+ *
+ */
+@PluginResource("resources/expressionModelTest.di") //$NON-NLS-1$
+public class IsTypeOfStereotypeExpressionTests {
+
+ private final EObject dummyEObject = EcoreFactory.eINSTANCE.createEClass();
+
+ private final String INVALID_STRING_QN = "Invalid::Qualified::Name"; //$NON-NLS-1$
+
+ private final String STEREOTYPED_CLASS_WITH_URI_NAME = "StereotypedWithURIClass"; //$NON-NLS-1$
+
+ private final String STEREOTYPED_CLASS_WITHOUT_URI_NAME = "StereotypedWithoutURIClass"; //$NON-NLS-1$
+
+ private final String STEREOTYPED_PROPERTY = "StereotypedWithURIProperty"; //$NON-NLS-1$
+
+ private final String NOT_STEREOTYPED_CLASS_NAME = "NoStereotypedClass"; //$NON-NLS-1$
+
+ private final String ELEMENT_STEREOTYPE_QUALIFIED_NAME = "RootElement::ANiceStereotypeForElement"; //$NON-NLS-1$
+
+ private final String PROPERTY_STEREOTYPED_QUALIFIED_NAME = "RootElement::ANiceStereotypeForProperty"; //$NON-NLS-1$
+
+ private Class stereotypedClassWithURI;
+
+ private Class stereotypedClassWithoutURI;
+
+ private Class notStereotypedClass;
+
+ private Property stereotypedProperty;
+
+ private final String PROFILE_URI = "papyrusExpressionProfile"; //$NON-NLS-1$
+
+ @Rule
+ public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();
+
+
+ @Before
+ public void init() {
+ stereotypedClassWithURI = (Class) fixture.getModel().getMember(STEREOTYPED_CLASS_WITH_URI_NAME);
+ stereotypedClassWithoutURI = (Class) fixture.getModel().getMember(STEREOTYPED_CLASS_WITHOUT_URI_NAME);
+ notStereotypedClass = (Class) fixture.getModel().getMember(NOT_STEREOTYPED_CLASS_NAME);
+ stereotypedProperty = (Property) stereotypedClassWithURI.getOwnedMember(STEREOTYPED_PROPERTY);
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code>
+ * <li>
+ * <li>stereotypeQN is <code>null</code></li>
+ * <li>context is <code>null</code></li>
+ * </ul>
+ */
+ @Test
+ public void IsTypeOfStereotypeExpression_Test1() {
+ final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+ Assert.assertFalse(exp.evaluate(null));
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is <code>null</code></li>
+ * <li>context is an EObject, but not an UML Element</li>
+ * </ul>
+ */
+ @Test
+ public void IsTypeOfStereotypeExpression_Test2() {
+ final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+ Assert.assertFalse(exp.evaluate(dummyEObject));
+ }
+
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is invalid</li>
+ * <li>context is <code>null</code></li>
+ * </ul>
+ */
+ @Test
+ public void IsTypeOfStereotypeExpression_Test3() {
+ final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(INVALID_STRING_QN);
+ Assert.assertFalse(exp.evaluate(null));
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is invalid</li>
+ * <li>context is an EObject, but not an UML Element</li>
+ * </ul>
+ */
+ @Test
+ public void IsTypeOfStereotypeExpression_Test4() {
+ final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(INVALID_STRING_QN);
+ Assert.assertFalse(exp.evaluate(dummyEObject));
+ }
+
+ /**
+ * The evaluate method must return <code>true</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML Stereotyped element with the expected stereotype</li>
+ * </ul>
+ */
+ @Test
+ public void IsTypeOfStereotypeExpression_Test5() {
+ final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+ Assert.assertTrue(exp.evaluate(this.stereotypedClassWithURI));
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML Stereotyped element but not with the expected property</li>
+ * </ul>
+ */
+ @Test
+ public void IsTypeOfStereotypeExpression_Test6() {
+ final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+ Assert.assertFalse(exp.evaluate(stereotypedProperty));
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML element not stereotyped</li>
+ * </ul>
+ */
+ @Test
+ public void IsTypeOfStereotypeExpression_Test7() {
+ final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+ Assert.assertFalse(exp.evaluate(notStereotypedClass));
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML element, but the stereotyped with the expected stereotype</li>
+ * </ul>
+ */
+ @Test
+ public void IsTypeOfStereotypeExpression_Test8() {
+ final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+ Assert.assertFalse(exp.evaluate(stereotypedClassWithURI));
+ }
+
+ /**
+ * The evaluate method must return <code>true</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML element, stereotyped with the expected stereotype</li>
+ * </ul>
+ */
+ @Test
+ public void IsTypeOfStereotypeExpression_Test9() {
+ final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+ Assert.assertTrue(exp.evaluate(stereotypedProperty));
+ }
+
+ /**
+ * The evaluate method must return <code>true</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is not <code>null</code></li>, but empty
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML element, stereotyped with the expected stereotype</li>
+ * </ul>
+ */
+ @Test
+ public void IsTypeOfStereotypeExpression_Test10() {
+ final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+ exp.setProfileURI(""); //$NON-NLS-1$
+ exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+ Assert.assertTrue(exp.evaluate(stereotypedProperty));
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML element,nto stereotyped</li>
+ * </ul>
+ */
+ @Test
+ public void IsTypeOfStereotypeExpression_Test11() {
+ final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+ Assert.assertFalse(exp.evaluate(notStereotypedClass));
+ }
+
+ /**
+ * The evaluate method must return <code>false</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML element stereotyped by a stereotype with the expected qualified name, but from the bas profile</li>
+ * </ul>
+ */
+ @Test
+ public void IsTypeOfStereotypeExpression_Test12() {
+ final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+ exp.setProfileURI(PROFILE_URI);
+ Assert.assertFalse(exp.evaluate(this.stereotypedClassWithoutURI));
+ }
+
+ /**
+ * The evaluate method must return <code>true</code> for these elements
+ *
+ * <ul>
+ * <li>profileURI is <code>null</code></li>
+ * <li>stereotypeQN is valid</li>
+ * <li>context is UML element stereotyped by a stereotype with the expected qualified name, but from the bas profile</li>
+ * </ul>
+ */
+ @Test
+ public void IsTypeOfStereotypeExpression_Test13() {
+ final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+ exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+ exp.setProfileURI(PROFILE_URI);
+ Assert.assertTrue(exp.evaluate(this.stereotypedClassWithURI));
+ }
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/META-INF/MANIFEST.MF
index ac9f11d8a0e..c0e9d15c960 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.eclipse.papyrus.junit.utils;bundle-version="[2.1.0,3.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
- org.eclipse.papyrus.uml.expressions;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.expressions;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)",
org.eclipse.gef;bundle-version="[3.11.0,4.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",

Back to the top