Merge "Bug 518047: [SysML 1.1] Provide default catalog expression for matrix"
diff --git a/org.eclipse.papyrus.sysml.targetplatform.oxygen/org.eclipse.papyrus.sysml.targetplatform.oxygen.target b/org.eclipse.papyrus.sysml.targetplatform.oxygen/org.eclipse.papyrus.sysml.targetplatform.oxygen.target
index 003d821..47f0ecc 100755
--- a/org.eclipse.papyrus.sysml.targetplatform.oxygen/org.eclipse.papyrus.sysml.targetplatform.oxygen.target
+++ b/org.eclipse.papyrus.sysml.targetplatform.oxygen/org.eclipse.papyrus.sysml.targetplatform.oxygen.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Oxygen" sequenceNumber="1491471559">
+<target name="Papyrus Oxygen" sequenceNumber="1499261704">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -10,25 +10,28 @@
       <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.views.properties.model.xwt" version="0.0.0"/>
       <repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.views.properties.model.xwt" version="0.0.0"/>
-      <repository id="eclipse-papyrus-oxygen-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="0.0.0"/>
       <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
+      <repository id="eclipse-papyrus-oxygen-developer" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.1.201509291144"/>
+      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.3.1.201509291144"/>
+      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.1.201509291144"/>
+      <repository id="gmfTooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrus.sysml.targetplatform.oxygen/org.eclipse.papyrus.sysml.targetplatform.oxygen.tpd b/org.eclipse.papyrus.sysml.targetplatform.oxygen/org.eclipse.papyrus.sysml.targetplatform.oxygen.tpd
index b15926e..993b8ee 100755
--- a/org.eclipse.papyrus.sysml.targetplatform.oxygen/org.eclipse.papyrus.sysml.targetplatform.oxygen.tpd
+++ b/org.eclipse.papyrus.sysml.targetplatform.oxygen/org.eclipse.papyrus.sysml.targetplatform.oxygen.tpd
@@ -7,23 +7,28 @@
  org.eclipse.equinox.p2.discovery.feature.feature.group lazy
  org.eclipse.equinox.executable.feature.group lazy
  org.eclipse.ocl.uml.feature.group lazy
+ org.eclipse.papyrus.sdk.feature.feature.group lazy
+ org.eclipse.papyrus.views.properties.model.xwt lazy 
 }
 
-location "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/" eclipse-papyrus-oxygen-nightly {
- org.eclipse.papyrus.sdk.feature.feature.group lazy
- org.eclipse.papyrus.views.properties.model.xwt lazy
- }
- 
+
  location nattable "http://download.eclipse.org/nattable/releases/1.5.0/repository" {
-	org.eclipse.nebula.widgets.nattable.core.feature.feature.group
-	org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group
-	org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group
-	org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group
-	org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group
-	org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group
+ org.eclipse.nebula.widgets.nattable.core.feature.feature.group lazy
+ org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group lazy
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group lazy
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group lazy
+ org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group lazy
+ org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group lazy
 }
- 
-location "https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/" eclipse-papyrus-developer-master {
+
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/" eclipse-papyrus-oxygen-developer {
 	org.eclipse.papyrus.junit.feature.feature.group lazy
 }
- 
\ No newline at end of file
+
+location gmfTooling "http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" { // gen
+	org.eclipse.gmf.tooling.feature.group
+	org.eclipse.gmf.tooling.runtime.feature.group
+	org.eclipse.gmf.tooling.codegen.xtend2.feature.group
+}
+
+ 
diff --git a/plugins/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF b/plugins/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
index 8048f71..e0393f5 100755
--- a/plugins/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
+++ b/plugins/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
@@ -2,7 +2,9 @@
 Export-Package: org.eclipse.papyrus.sysml.nattable.manager.axis
 Require-Bundle: org.eclipse.papyrus.uml.nattable;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.papyrus.sysml.service.types;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+ org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ 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)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 2.0.0.qualifier
diff --git a/plugins/nattable/org.eclipse.papyrus.sysml.nattable/build.properties b/plugins/nattable/org.eclipse.papyrus.sysml.nattable/build.properties
index f8d41a3..181abc5 100755
--- a/plugins/nattable/org.eclipse.papyrus.sysml.nattable/build.properties
+++ b/plugins/nattable/org.eclipse.papyrus.sysml.nattable/build.properties
@@ -4,5 +4,6 @@
                .,\
                plugin.xml,\
                OSGI-INF/,\
-               about.html
+               about.html,\
+               resources/
 src.includes = about.html
diff --git a/plugins/nattable/org.eclipse.papyrus.sysml.nattable/plugin.xml b/plugins/nattable/org.eclipse.papyrus.sysml.nattable/plugin.xml
index d3b9295..02aff48 100755
--- a/plugins/nattable/org.eclipse.papyrus.sysml.nattable/plugin.xml
+++ b/plugins/nattable/org.eclipse.papyrus.sysml.nattable/plugin.xml
@@ -30,4 +30,10 @@
             manager="org.eclipse.papyrus.sysml.nattable.manager.axis.AllocateAxisManager">
       </axisManager>
    </extension>
+   <extension
+        point="org.eclipse.papyrus.infra.emf.expressions.expressionCatalog">
+     <catalog
+           file="resources/SysML.expressions">
+     </catalog>
+   </extension>    
 </plugin>
diff --git a/plugins/nattable/org.eclipse.papyrus.sysml.nattable/resources/SysML.expressions b/plugins/nattable/org.eclipse.papyrus.sysml.nattable/resources/SysML.expressions
new file mode 100755
index 0000000..6660c67
--- /dev/null
+++ b/plugins/nattable/org.eclipse.papyrus.sysml.nattable/resources/SysML.expressions
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<expressions:ExpressionCatalog xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:expressions="http://www.eclipse.org/papyrus/expressions" xmlns:umlexpressions="http://www.eclipse.org/papyrus/umlexpressions" xmi:id="_ZZ6v0EzwEeeaWvfQNc-h9A" name="SysML 1.1 Expressions" description="This catalog provides expressions for the profile SysML 1.1.">
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v0UzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Activities::Continuous" description="This expression returns TRUE if the Element is stereotyped with SysML::Activities::Continuous and FALSE otherwise." stereotypeQualifiedName="SysML::Activities::Continuous" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v0kzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Activities::ControlOperator" description="This expression returns TRUE if the Element is stereotyped with SysML::Activities::ControlOperator and FALSE otherwise." stereotypeQualifiedName="SysML::Activities::ControlOperator" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v00zwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Activities::Discrete" description="This expression returns TRUE if the Element is stereotyped with SysML::Activities::Discrete and FALSE otherwise." stereotypeQualifiedName="SysML::Activities::Discrete" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v1EzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Activities::NoBuffer" description="This expression returns TRUE if the Element is stereotyped with SysML::Activities::NoBuffer and FALSE otherwise." stereotypeQualifiedName="SysML::Activities::NoBuffer" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v1UzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Activities::Optional" description="This expression returns TRUE if the Element is stereotyped with SysML::Activities::Optional and FALSE otherwise." stereotypeQualifiedName="SysML::Activities::Optional" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v1kzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Activities::Overwrite" description="This expression returns TRUE if the Element is stereotyped with SysML::Activities::Overwrite and FALSE otherwise." stereotypeQualifiedName="SysML::Activities::Overwrite" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v10zwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Activities::Probability" description="This expression returns TRUE if the Element is stereotyped with SysML::Activities::Probability and FALSE otherwise." stereotypeQualifiedName="SysML::Activities::Probability" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v2EzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Activities::Rate" description="This expression returns TRUE if the Element is stereotyped with SysML::Activities::Rate and FALSE otherwise." stereotypeQualifiedName="SysML::Activities::Rate" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v2UzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Allocations::Allocate" description="This expression returns TRUE if the Element is stereotyped with SysML::Allocations::Allocate and FALSE otherwise." stereotypeQualifiedName="SysML::Allocations::Allocate" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v2kzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Allocations::AllocateActivityPartition" description="This expression returns TRUE if the Element is stereotyped with SysML::Allocations::AllocateActivityPartition and FALSE otherwise." stereotypeQualifiedName="SysML::Allocations::AllocateActivityPartition" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v20zwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Allocations::Allocated" description="This expression returns TRUE if the Element is stereotyped with SysML::Allocations::Allocated and FALSE otherwise." stereotypeQualifiedName="SysML::Allocations::Allocated" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v3EzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Blocks::BindingConnector" description="This expression returns TRUE if the Element is stereotyped with SysML::Blocks::BindingConnector and FALSE otherwise." stereotypeQualifiedName="SysML::Blocks::BindingConnector" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v3UzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Blocks::Block" description="This expression returns TRUE if the Element is stereotyped with SysML::Blocks::Block and FALSE otherwise." stereotypeQualifiedName="SysML::Blocks::Block" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v3kzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Blocks::ConnectorProperty" description="This expression returns TRUE if the Element is stereotyped with SysML::Blocks::ConnectorProperty and FALSE otherwise." stereotypeQualifiedName="SysML::Blocks::ConnectorProperty" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v30zwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Blocks::Dimension" description="This expression returns TRUE if the Element is stereotyped with SysML::Blocks::Dimension and FALSE otherwise." stereotypeQualifiedName="SysML::Blocks::Dimension" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v4EzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Blocks::DistributedProperty" description="This expression returns TRUE if the Element is stereotyped with SysML::Blocks::DistributedProperty and FALSE otherwise." stereotypeQualifiedName="SysML::Blocks::DistributedProperty" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v4UzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Blocks::NestedConnectorEnd" description="This expression returns TRUE if the Element is stereotyped with SysML::Blocks::NestedConnectorEnd and FALSE otherwise." stereotypeQualifiedName="SysML::Blocks::NestedConnectorEnd" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v4kzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Blocks::ParticipantProperty" description="This expression returns TRUE if the Element is stereotyped with SysML::Blocks::ParticipantProperty and FALSE otherwise." stereotypeQualifiedName="SysML::Blocks::ParticipantProperty" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v40zwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Blocks::PropertySpecificType" description="This expression returns TRUE if the Element is stereotyped with SysML::Blocks::PropertySpecificType and FALSE otherwise." stereotypeQualifiedName="SysML::Blocks::PropertySpecificType" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v5EzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Blocks::Unit" description="This expression returns TRUE if the Element is stereotyped with SysML::Blocks::Unit and FALSE otherwise." stereotypeQualifiedName="SysML::Blocks::Unit" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v5UzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Blocks::ValueType" description="This expression returns TRUE if the Element is stereotyped with SysML::Blocks::ValueType and FALSE otherwise." stereotypeQualifiedName="SysML::Blocks::ValueType" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v5kzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Constraints::ConstraintBlock" description="This expression returns TRUE if the Element is stereotyped with SysML::Constraints::ConstraintBlock and FALSE otherwise." stereotypeQualifiedName="SysML::Constraints::ConstraintBlock" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v50zwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Constraints::ConstraintProperty" description="This expression returns TRUE if the Element is stereotyped with SysML::Constraints::ConstraintProperty and FALSE otherwise." stereotypeQualifiedName="SysML::Constraints::ConstraintProperty" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v6EzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::ModelElements::Conform" description="This expression returns TRUE if the Element is stereotyped with SysML::ModelElements::Conform and FALSE otherwise." stereotypeQualifiedName="SysML::ModelElements::Conform" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v6UzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::ModelElements::Problem" description="This expression returns TRUE if the Element is stereotyped with SysML::ModelElements::Problem and FALSE otherwise." stereotypeQualifiedName="SysML::ModelElements::Problem" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v6kzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::ModelElements::Rationale" description="This expression returns TRUE if the Element is stereotyped with SysML::ModelElements::Rationale and FALSE otherwise." stereotypeQualifiedName="SysML::ModelElements::Rationale" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v60zwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::ModelElements::View" description="This expression returns TRUE if the Element is stereotyped with SysML::ModelElements::View and FALSE otherwise." stereotypeQualifiedName="SysML::ModelElements::View" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v7EzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::ModelElements::ViewPoint" description="This expression returns TRUE if the Element is stereotyped with SysML::ModelElements::ViewPoint and FALSE otherwise." stereotypeQualifiedName="SysML::ModelElements::ViewPoint" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v7UzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::PortAndFlows::FlowPort" description="This expression returns TRUE if the Element is stereotyped with SysML::PortAndFlows::FlowPort and FALSE otherwise." stereotypeQualifiedName="SysML::PortAndFlows::FlowPort" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v7kzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::PortAndFlows::FlowProperty" description="This expression returns TRUE if the Element is stereotyped with SysML::PortAndFlows::FlowProperty and FALSE otherwise." stereotypeQualifiedName="SysML::PortAndFlows::FlowProperty" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v70zwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::PortAndFlows::FlowSpecification" description="This expression returns TRUE if the Element is stereotyped with SysML::PortAndFlows::FlowSpecification and FALSE otherwise." stereotypeQualifiedName="SysML::PortAndFlows::FlowSpecification" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v8EzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::PortAndFlows::ItemFlow" description="This expression returns TRUE if the Element is stereotyped with SysML::PortAndFlows::ItemFlow and FALSE otherwise." stereotypeQualifiedName="SysML::PortAndFlows::ItemFlow" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v8UzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Requirements::Copy" description="This expression returns TRUE if the Element is stereotyped with SysML::Requirements::Copy and FALSE otherwise." stereotypeQualifiedName="SysML::Requirements::Copy" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v8kzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Requirements::DeriveReqt" description="This expression returns TRUE if the Element is stereotyped with SysML::Requirements::DeriveReqt and FALSE otherwise." stereotypeQualifiedName="SysML::Requirements::DeriveReqt" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v80zwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Requirements::Requirement" description="This expression returns TRUE if the Element is stereotyped with SysML::Requirements::Requirement and FALSE otherwise." stereotypeQualifiedName="SysML::Requirements::Requirement" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v9EzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Requirements::RequirementRelated" description="This expression returns TRUE if the Element is stereotyped with SysML::Requirements::RequirementRelated and FALSE otherwise." stereotypeQualifiedName="SysML::Requirements::RequirementRelated" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v9UzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Requirements::Satisfy" description="This expression returns TRUE if the Element is stereotyped with SysML::Requirements::Satisfy and FALSE otherwise." stereotypeQualifiedName="SysML::Requirements::Satisfy" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v9kzwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Requirements::TestCase" description="This expression returns TRUE if the Element is stereotyped with SysML::Requirements::TestCase and FALSE otherwise." stereotypeQualifiedName="SysML::Requirements::TestCase" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+  <expressions xsi:type="umlexpressions:IsStereotypedWithExpression" xmi:id="_ZZ6v90zwEeeaWvfQNc-h9A" name="IsStereotypedWith_SysML::Requirements::Verify" description="This expression returns TRUE if the Element is stereotyped with SysML::Requirements::Verify and FALSE otherwise." stereotypeQualifiedName="SysML::Requirements::Verify" profileURI="http://www.eclipse.org/papyrus/0.7.0/SysML"/>
+</expressions:ExpressionCatalog>
diff --git a/tests/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF
index 9fa7a62..befce47 100755
--- a/tests/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF
@@ -68,7 +68,6 @@
  org.eclipse.papyrus.infra.newchild;bundle-version="3.0.0",
  org.eclipse.papyrus.uml.alf;bundle-version="3.0.0",
  org.eclipse.papyrus.uml.alf.common;bundle-version="2.0.0",
- org.eclipse.papyrus.uml.alf.common.source;bundle-version="2.0.0",
  org.eclipse.papyrus.uml.alf.to.fuml;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.architecture;bundle-version="1.0.0",
  org.eclipse.papyrus.uml.commands;bundle-version="1.3.0",